straightened Makefile with respect to tests