Added missing relationships and tests