Renamed Makefile.target to Makefile.tests and folded in