example and test server simplifications