DDF642: Fixed tests; updated logic for 0 index results