[TASK] Adapt tests to changes in previous commits