Cleaned up basic relationship queries
Added a bit more testing setup.  Not yet hooked in.