Changes to testing options.
Converted Map into ArrayList of tuples (so that I have an index map now).