Move test class for consistency