FIX:  Dataset indexing (with TEST)