extra tests for #556