1.8.7 tests passing (hopefully!)