finalized makefile and tests for milestone 3