Makefile - Fix mtest target (and clean up utest targets)