tests for #630