Fixing specs
PSR4 compatibility