clean up tests a bit, makefile for tests