Makefile tweaks, added "make test".