Improve testing check