Make tests run via makefile.
Update test code.