tests were a bit too random, causing intermittent failures