Fix an issue in tests for 1.8.7