Couple of trivial Common test fixes.