Fixing tests for #780