Fixes trace tests