Merge "Add fifo_tests"