brent: make tests more robust