Add guard-tap to automate testing