more tweaks for tests