Update make file

Update make file and fix tests.