Fixed bits of a failing test, but not all.