Fixes get_indices to check for Idx before Atom now that Idx is Atom.
Fixes order of terms in test strings to match chang when Idx and IndexedBase became atoms