Add relations and get tests running