Update to make the unit tests work in PHPCI
Codesniffer fixes