Improve test.
Improve test -- oops
Fix non-lower-tri section of code. Hurrah.
Fix permutation in non-upper-tri case. Some more tidying.