Moved some classes in test project