Fiddling around to get test suite to run