fixes to some tests.