Fix ValueSpace expectations.