refactor guardian specs