Moved test-specific classes to test folder