Added tests back to makefile