changes to use all classes in makefile and altered testfiles