more tweaks to tests.