Fix test and dowgrade from global options