Changed the test framework being used and modified the Makefile and other .c and .h files accordingly