Update tests to include PHP54 and phpcs