Spec coverage confirming past work fixes #2