prettifying Makefile
some more test coverage