Use serviceRoot to populate Database struct fields, rather than being included
as a field itself.
Update references to db serviceRoot fields to now refer directly to Database struct fields.
Disable cypher query test until it is finished.
broken test