Added Guard for automated tests