Fixing other broken tests