Changed to metamodels base unit tests
PSR-1 / PSR-2 fixes