adapt tests to use new services