Merge branch 'jc/t1400-fifo-cleanup'

Test cleanup. * jc/t1400-fifo-cleanup: t1400: have fifo test clean after itself