Test server cleanup + addition of WSGI-compatible CherryPy server