re-enabled some tests in the Makefile