Merge "Small test fixes."