changed mock classes