Merge latest test from master.