First relationships changes, some errors in the test suite