more modifications for the mock classes