Fix tests

Solves #52. I rerun the tests after getting again the stochastic failiure discussed in issue #48.