Option adjustment
Merge branch 'tests'