MOAR PSR-4 updates! All tests pass