Fix tests for Beta 4.