Fix tests
Checking in changes prior to tagging of version 1.18.0.