Pull in minor test changes.