Fixed index dsl tests and expanded for new options