Fix specs and ensure we reset lazy accessors on Guard.setup