Fix tests

Fixes to make automated waterline-adapter tests pass