Fix test issues.