Added test cases. Updated makefile.