cleanup server env for tests
update utils