more fixes to test.