Add a few more tests, fix makefile