Relationships pulled from graph in prepare, fixes to test/train args