Merge branch 'test-cleanup' of https://github.com/vincentkfu/fio