Fixed FifoMapTest so that order of tests are no longer important