Removed unecessary clone, added fifo test