Migrated unit-tests to use the new options