* first pass linter cleanup * address review comments
* add unit tests * cleanup * cleanup * rename helper file, remove gomock.eq() * update import