A few triage fixes plus running more tests

Mostly just test suite modifications.