BACKLOG-1214 Moved test classes to correct namespace so composer autoloading does not have to use classmap anymore
BACKLOG-1214 Fixed conflict