Move test-selectors down to service project