Split Option tests from non-option ones