update tests for #2078 and #2092