Refactoring and started to fix cypher rspecs

Lots of broken RSpecs