Fixed: more trustable test check