Clean up test dependencies

Really shouldn't depend on services.core unless absolutely necessary,
if it is necessary, you need all the services deps to make sure you
don't miss classes.

Test: runtest --path ...
Change-Id: I9ee74cfbe45b2a896a57b5cde388c2d613ff7019