Several more fixes to tests and/or module; more tests passing again.