Fixing tests in 1.8.7