Changed test foundation and fixed relation ship definitions for testing.
Merge ../xo-titan