CS fixes and updating deprecated phpunit method calls