many updates for spec tests