Fixes to tests.  5 remaining errors, some clear on second run.