Fixed test
Changes shenanigans
Using PSR-4