Fix a pair of problems in tests
Add a handy make target running the test suite