Expected text fix and cleanup.