more tweaks in tests