Reverting back to the small test API.
Remove Mocker from tests.