Fix tests for #467.