Refactor Artefacts.TestClient classes for better organisation