Moved mock objects to parent classes for their respective fields