Couple of test fixes.