Making the specs less terrible