Reduce tests matrix, will be revert