Fix tests
Adapt to the latest code changes