Moved test classes to correct place.