Pull in unit test fixes.