Fixing up tests for 1.8.7