make classmethods instance methods and refactor
moved test data files