Started setting up unit tests and changed make file