bringing more tests into the new regime.  also updating makefile