Fixed tests: no more random failures