Adding some guard helpers and tests