test fixes round 2