Adding test and class files