Fix options and tests