Simplify client/server self test