Improve testing reliability