Added Classic TestClient
Added Classic Support #2