Incorporation of CocoaLumberjack and improvements to mock service