Add many missing closing PHP tags to tests

Closes GH-5958

Fix leak of dynamic property name in address helper