carry over test fixes from trunk