Fixed the unit tests for the service scope change