Fixes to some cypher test failures