Changing ObjectFactory methods to take Neo4j-specific arguments.
Updating tests and implementations in light of this change.
Test cleanup.