Merge "Revert "Allows to skip old tests for new networks."" into main