Reverting back to the small test API.
Remove Mocker from tests.
Fix Unit for PHP 5.4.12.