Spec cleanup after feature #11