Move test class to test folder