Added tests for second round, updated makefile