Replace very trivial mock builders with createMock()