Reactivate some deactivated unit tests.
Add a Makefile that is sometimes convenient/faster.