Fix remaining cases of leaking imports
stdtest: Fix all leaked trait imports
extratest: Fix all leaked trait imports