adding more unit tests and fixing the make file