Fix tests for #439 / #438