Move test class to a proper package