Changes in unit tests to account for test service.