more tweaking of tests