Update make file.
Merge pull request #185 from Gizra/update-make

Update make file and fix tests.