Added makefile
Added missing unit test, fixed test