Fix tests. Account for dropping of size_type as a configurable parameter.