test fixes (2)1