Fixes tests broken by merging of PR #1412