Update tests for #1116