Fixed some failing 1.9 tests.