extratest: Fix all leaked trait imports