Fix make files and running tests.