Adjust tests to support 1.8.7