Add Guard for automation of tests