Cleanup, and uncomment more asserts.  Now only 2 non-many-to-many tests fail, with all of the stuff uncommented
All but many to many tests pass