debugging test server, minor changes #ciskip