Fix some regressed tests.