changes in TestTWoPushCDI reverted because of a bug in MatrixConfigurator