Fixing 1.8 tests