Updated tests to work, composer to use classmap