Fix tests
Simplify extract_global_options!