Fixed (hacked) ordering of tests run in FifoMapTest