added more tests, fixed makefile bug