Updated fogservice unit tests to abstract out some shared unit tests
remove deprecated mock to use double