Fixing test (broken by merge from unstable)