Fix tests broken by previous commit 92fbcc