Improves spec to be less redudant and check links