Update to work with the last version of the core.
Add trace in tests.