Fixing test issues.