WIP: Merge all new style ITs into one module

In order to be easier to shard ITs merge all modules that contain new style ITs under one module