Some fixes for #111's tests in 1.8.7