Fixed the tests makefile and added travis back