Add test to verify query count for each service
Add missing relationships to various pages
Handle inheritance in association_proxy targets