This solved the test errors, but the real issue is how 1.8.7 splats nil arguments. Updating in new PR.