merged files from the TestingFeatures Branch also modified php to call from it