more mock fixes