fixed service tests to work with cache persistence