updated mock classes