Fix options behavior
Fix tests