Remove a test line and rename a cmake option.