I recognize also that this will increase the duration of the test suite, but I would prefer more small, simple tests which are easy to understand and debug to longer, more complex ones which are faster. We will have to run these in parallel soon anyways.