Mild changes to Makefile so all tests work out of the box.