Added tests, updated makefile