Improvements to MockRepositoryTest

Change-Id: I81dbc02d7c8aabe82266e4c873b7141947b290ed