Clarify specs, stop using described_class