Spec "fix"/cleanup

Switched specs so that descriptions match code.