Adding Guard for automated testing