Makefile rejigging such that make run-tests will work immediately.