Working on mocks for tests.

Change-Id: I7b877a4dca0bcd660b26a7e54f8eb6c3af20d910