Simplify test server and vendors.