Write first test cases, update Makefile