Attempt to get test runner going - take 2