Fix test issues in build.