store relations in registry
1.7b4 tests, testapp test fixes, import cleanup