Makefile
More test coverage