Consolidate back to a single Spec.hs