Fixed compilation issues in ubuntu, added separate unit test file for make