- fix a couple tests and traces