eliminated 'mock deprecated' warnings from unit tests

Hi Bas, I am trying to get osaka running on mavericks.  First I am cleaning up the unit tests.  Then I'll move onto the integration tests.

thanks