Making tests pass on 1.8.
Adding 1.8.7 to Travis build.