Using ordered dicts. Concluded tests are OK after all