UTest+MTest - Minor makefile fixes for travis-ci