Use make_assertion (rather than assert_block).
Re-enable 1.8.7 tests