Update tests based on current issues pending spec revision.