KFSUPGRADE-997 fixes to tests, making failure more verbose