Fix tests which broke in commit de4e903