Rename Type to Expected. Other tweaks.