Fix: tests after last commits