Ongoing work on php server tests
Class renaming