make main() use test class, update makefile