remove trace' - all tests pass!