Bugfix/187 fixes

Fix a couple of integration specs which weren't working on 1.8.7.

No known issues with the actual library on 1.8.7, these are spec code fixes.