Only include php files in the test
Fix some errors