Changed how tests are invoked by going through a makefile