Update tests to use new class methods for services.