Remove test of a removed functionality, improve stochastic testing