do-test script now launches 2 our our servers and 2 provided servers and 2 clients.
Resolved merge conflicts.