Simplify gomock usage

Mikhail Mazurskiy requested to merge ash2k/simplify-tests into master Jan 30, 2021