Added test files from TA and modified Makefiles