Tests updated for #1841