Refactored and moved test classes