Split out separate use cases to try and catch all the code paths