Enabling test coverage; fixing 1.8.7 tests.