Test fix - actually

This should actually make the tests pass.  Though the erroring out is still problematic...