Fixed makefile formatting and added more targets.
Added more test cases.