eliminated 'mock deprecated' warnings from unit tests