Fixing UNIX server per test failures