more tweaks for running on tests on server