Add Guard to automate testing - Issue #1