Finally get test output under control
Get a good error msg, update test