There is a failing test for relationships. Also cleaned up the tests
some.