Move test class into model folder with others