Small changes to mock classes