Updaet composer.json to respect psr4
Update test autoloading