Try to improve test reliability