Trace fix & couple test related fixes