Update tests for #340 and #444