Fixed options parsing and tests