Refine tests to make it possible to run server and tests on diff machines