updates and fixes to tests.