Add/fix mocks for 4 unit tests.