SwicthYard: added more test stability