More test fixes after changes in c2c6fbdd8dddbb6ccba0a6ae49a13d5364122df7