Fix options + tests