Fixing test expected values where 4.0 schema differs from 3.x.