Extend permutations tested in basic test, move edge cases to separate test, and add regression test for bug 1195735