Also refactored mocks into their original packages, to avoid cyclic references. Is there a better way to have mocks in GoLang tests?