Misc update to tests.