more tests, tweaks to combinatorial functions.