Fixed some tests that were changed (fixed!) by fixing #3966.