fixed the TestClient's butterfly catch bug + minor updates