Cleaning up specs, in light of recent attachment logic modifications.