What I would propose is also take a look how this would look like, if we would just remove the testing of various client flavors, and remove the integration test categories as a separate PR and maybe compare with this approach. (Can try later just quite sick atm)