Improve testing stability