making tests pass for 1.8.7