Fixing broken tests due to mismatched classes