Merged fixed test from 3.2.