adjust a few more mock init returns
require newer version of mock for testing