improve tests for #431