Added fixes for unit tests.
Merge pull request #156 from SergeyVasiliev/fix_unit_tests

Add/fix mocks for 4 unit tests.