Resolved broken tests