Refactor tests to use CypherFunSuite instead of FlatSpec