Rework for complete testing

Including php file modifications, etc
Before testing