[MIN] More test + general availability of mocks