These tests pass.  Not sure why they were @Ignored.
Cleanup imports.
Fixed assertion by getting rid of old graph query code.