Add test options to Makefile. Tell Travis to use makefile