Introduce base class for test service.

TestService now derives from TestBaseService. This better reflects how
client code will actually work.
Merge branch 'base-service' into develop