I'm all right with these being separate for now, but if they're very similar, should we consider merging them and then running it twice in make test, once with and one without fault injection?