diff --git a/forge_test.go b/forge_test.go
index c13feaa..747b37a 100644
--- a/forge_test.go
+++ b/forge_test.go
@@ -31,25 +31,38 @@ func TestForge_Good_Client(t *testing.T) {
 	}
 }
 
-func TestRepoService_Good_List(t *testing.T) {
+func TestRepoService_Good_ListOrgRepos(t *testing.T) {
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodGet {
+			t.Errorf("expected GET, got %s", r.Method)
+		}
+		if r.URL.Path != "/api/v1/orgs/core/repos" {
+			t.Errorf("wrong path: %s", r.URL.Path)
+			http.NotFound(w, r)
+			return
+		}
 		w.Header().Set("X-Total-Count", "1")
 		json.NewEncoder(w).Encode([]types.Repository{{Name: "go-forge"}})
 	}))
 	defer srv.Close()
 
 	f := NewForge(srv.URL, "tok")
-	result, err := f.Repos.List(context.Background(), Params{"org": "core"}, DefaultList)
+	repos, err := f.Repos.ListOrgRepos(context.Background(), "core")
 	if err != nil {
 		t.Fatal(err)
 	}
-	if len(result.Items) != 1 || result.Items[0].Name != "go-forge" {
-		t.Errorf("unexpected result: %+v", result)
+	if len(repos) != 1 || repos[0].Name != "go-forge" {
+		t.Errorf("unexpected result: %+v", repos)
 	}
 }
 
 func TestRepoService_Good_Get(t *testing.T) {
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != "/api/v1/repos/core/go-forge" {
+			t.Errorf("wrong path: %s", r.URL.Path)
+			http.NotFound(w, r)
+			return
+		}
 		json.NewEncoder(w).Encode(types.Repository{Name: "go-forge", FullName: "core/go-forge"})
 	}))
 	defer srv.Close()
@@ -64,6 +77,67 @@ func TestRepoService_Good_Get(t *testing.T) {
 	}
 }
 
+func TestRepoService_Good_Update(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodPatch {
+			t.Errorf("expected PATCH, got %s", r.Method)
+		}
+		if r.URL.Path != "/api/v1/repos/core/go-forge" {
+			t.Errorf("wrong path: %s", r.URL.Path)
+			http.NotFound(w, r)
+			return
+		}
+		var body types.EditRepoOption
+		json.NewDecoder(r.Body).Decode(&body)
+		json.NewEncoder(w).Encode(types.Repository{Name: body.Name, FullName: "core/" + body.Name})
+	}))
+	defer srv.Close()
+
+	f := NewForge(srv.URL, "tok")
+	repo, err := f.Repos.Update(context.Background(), Params{"owner": "core", "repo": "go-forge"}, &types.EditRepoOption{
+		Name: "go-forge-renamed",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if repo.Name != "go-forge-renamed" {
+		t.Errorf("got name=%q", repo.Name)
+	}
+}
+
+func TestRepoService_Good_Delete(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodDelete {
+			t.Errorf("expected DELETE, got %s", r.Method)
+		}
+		if r.URL.Path != "/api/v1/repos/core/go-forge" {
+			t.Errorf("wrong path: %s", r.URL.Path)
+			http.NotFound(w, r)
+			return
+		}
+		w.WriteHeader(http.StatusNoContent)
+	}))
+	defer srv.Close()
+
+	f := NewForge(srv.URL, "tok")
+	if err := f.Repos.Delete(context.Background(), Params{"owner": "core", "repo": "go-forge"}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestRepoService_Bad_Get(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusNotFound)
+		json.NewEncoder(w).Encode(map[string]string{"message": "not found"})
+	}))
+	defer srv.Close()
+
+	f := NewForge(srv.URL, "tok")
+	if _, err := f.Repos.Get(context.Background(), Params{"owner": "core", "repo": "go-forge"}); !IsNotFound(err) {
+		t.Fatalf("expected not found, got %v", err)
+	}
+}
+
 func TestRepoService_Good_Fork(t *testing.T) {
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.Method != http.MethodPost {
diff --git a/issues_test.go b/issues_test.go
index 8ad5fbf..b9d7ed1 100644
--- a/issues_test.go
+++ b/issues_test.go
@@ -15,6 +15,11 @@ func TestIssueService_Good_List(t *testing.T) {
 		if r.Method != http.MethodGet {
 			t.Errorf("expected GET, got %s", r.Method)
 		}
+		if r.URL.Path != "/api/v1/repos/core/go-forge/issues" {
+			t.Errorf("wrong path: %s", r.URL.Path)
+			http.NotFound(w, r)
+			return
+		}
 		w.Header().Set("X-Total-Count", "2")
 		json.NewEncoder(w).Encode([]types.Issue{
 			{ID: 1, Title: "bug report"},
@@ -63,6 +68,11 @@ func TestIssueService_Good_Create(t *testing.T) {
 		if r.Method != http.MethodPost {
 			t.Errorf("expected POST, got %s", r.Method)
 		}
+		if r.URL.Path != "/api/v1/repos/core/go-forge/issues" {
+			t.Errorf("wrong path: %s", r.URL.Path)
+			http.NotFound(w, r)
+			return
+		}
 		var body types.CreateIssueOption
 		json.NewDecoder(r.Body).Decode(&body)
 		w.WriteHeader(http.StatusCreated)
@@ -83,6 +93,81 @@ func TestIssueService_Good_Create(t *testing.T) {
 	}
 }
 
+func TestIssueService_Good_Update(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodPatch {
+			t.Errorf("expected PATCH, got %s", r.Method)
+		}
+		if r.URL.Path != "/api/v1/repos/core/go-forge/issues/1" {
+			t.Errorf("wrong path: %s", r.URL.Path)
+			http.NotFound(w, r)
+			return
+		}
+		var body types.EditIssueOption
+		json.NewDecoder(r.Body).Decode(&body)
+		json.NewEncoder(w).Encode(types.Issue{ID: 1, Title: body.Title, Index: 1})
+	}))
+	defer srv.Close()
+
+	f := NewForge(srv.URL, "tok")
+	issue, err := f.Issues.Update(context.Background(), Params{"owner": "core", "repo": "go-forge", "index": "1"}, &types.EditIssueOption{
+		Title: "updated issue",
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if issue.Title != "updated issue" {
+		t.Errorf("got title=%q", issue.Title)
+	}
+}
+
+func TestIssueService_Good_Delete(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodDelete {
+			t.Errorf("expected DELETE, got %s", r.Method)
+		}
+		if r.URL.Path != "/api/v1/repos/core/go-forge/issues/1" {
+			t.Errorf("wrong path: %s", r.URL.Path)
+			http.NotFound(w, r)
+			return
+		}
+		w.WriteHeader(http.StatusNoContent)
+	}))
+	defer srv.Close()
+
+	f := NewForge(srv.URL, "tok")
+	if err := f.Issues.Delete(context.Background(), Params{"owner": "core", "repo": "go-forge", "index": "1"}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestIssueService_Good_CreateComment(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodPost {
+			t.Errorf("expected POST, got %s", r.Method)
+		}
+		if r.URL.Path != "/api/v1/repos/core/go-forge/issues/1/comments" {
+			t.Errorf("wrong path: %s", r.URL.Path)
+			http.NotFound(w, r)
+			return
+		}
+		var body types.CreateIssueCommentOption
+		json.NewDecoder(r.Body).Decode(&body)
+		w.WriteHeader(http.StatusCreated)
+		json.NewEncoder(w).Encode(types.Comment{ID: 7, Body: body.Body})
+	}))
+	defer srv.Close()
+
+	f := NewForge(srv.URL, "tok")
+	comment, err := f.Issues.CreateComment(context.Background(), "core", "go-forge", 1, "first!")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if comment.Body != "first!" {
+		t.Errorf("got body=%q", comment.Body)
+	}
+}
+
 func TestIssueService_Good_Pin(t *testing.T) {
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.Method != http.MethodPost {
@@ -101,3 +186,38 @@ func TestIssueService_Good_Pin(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func TestIssueService_Bad_List(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusInternalServerError)
+		json.NewEncoder(w).Encode(map[string]string{"message": "boom"})
+	}))
+	defer srv.Close()
+
+	f := NewForge(srv.URL, "tok")
+	if _, err := f.Issues.List(context.Background(), Params{"owner": "core", "repo": "go-forge"}, DefaultList); err == nil {
+		t.Fatal("expected error")
+	}
+}
+
+func TestIssueService_Ugly_ListIgnoresIndexParam(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != "/api/v1/repos/core/go-forge/issues" {
+			t.Errorf("wrong path: %s", r.URL.Path)
+			http.NotFound(w, r)
+			return
+		}
+		w.Header().Set("X-Total-Count", "0")
+		json.NewEncoder(w).Encode([]types.Issue{})
+	}))
+	defer srv.Close()
+
+	f := NewForge(srv.URL, "tok")
+	result, err := f.Issues.List(context.Background(), Params{"owner": "core", "repo": "go-forge", "index": "99"}, DefaultList)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(result.Items) != 0 {
+		t.Errorf("got %d items, want 0", len(result.Items))
+	}
+}
diff --git a/pulls_test.go b/pulls_test.go
index cdc9512..b88ba22 100644
--- a/pulls_test.go
+++ b/pulls_test.go
@@ -15,6 +15,11 @@ func TestPullService_Good_List(t *testing.T) {
 		if r.Method != http.MethodGet {
 			t.Errorf("expected GET, got %s", r.Method)
 		}
+		if r.URL.Path != "/api/v1/repos/core/go-forge/pulls" {
+			t.Errorf("wrong path: %s", r.URL.Path)
+			http.NotFound(w, r)
+			return
+		}
 		w.Header().Set("X-Total-Count", "2")
 		json.NewEncoder(w).Encode([]types.PullRequest{
 			{ID: 1, Title: "add feature"},
@@ -63,6 +68,11 @@ func TestPullService_Good_Create(t *testing.T) {
 		if r.Method != http.MethodPost {
 			t.Errorf("expected POST, got %s", r.Method)
 		}
+		if r.URL.Path != "/api/v1/repos/core/go-forge/pulls" {
+			t.Errorf("wrong path: %s", r.URL.Path)
+			http.NotFound(w, r)
+			return
+		}
 		var body types.CreatePullRequestOption
 		json.NewDecoder(r.Body).Decode(&body)
 		w.WriteHeader(http.StatusCreated)
@@ -107,3 +117,16 @@ func TestPullService_Good_Merge(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func TestPullService_Bad_Merge(t *testing.T) {
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusConflict)
+		json.NewEncoder(w).Encode(map[string]string{"message": "already merged"})
+	}))
+	defer srv.Close()
+
+	f := NewForge(srv.URL, "tok")
+	if err := f.Pulls.Merge(context.Background(), "core", "go-forge", 7, "merge"); !IsConflict(err) {
+		t.Fatalf("expected conflict, got %v", err)
+	}
+}
diff --git a/resource.go b/resource.go
index e322973..3ee5d45 100644
--- a/resource.go
+++ b/resource.go
@@ -57,7 +57,7 @@ func (r *Resource[T, C, U]) Get(ctx context.Context, params Params) (*T, error)
 // Create creates a new resource.
 func (r *Resource[T, C, U]) Create(ctx context.Context, params Params, body *C) (*T, error) {
 	var out T
-	if err := r.client.Post(ctx, ResolvePath(r.path, params), body, &out); err != nil {
+	if err := r.client.Post(ctx, ResolvePath(r.collection, params), body, &out); err != nil {
 		return nil, err
 	}
 	return &out, nil
diff --git a/resource_test.go b/resource_test.go
index 0b00b81..6d0d560 100644
--- a/resource_test.go
+++ b/resource_test.go
@@ -70,6 +70,11 @@ func TestResource_Good_Create(t *testing.T) {
 		if r.Method != http.MethodPost {
 			t.Errorf("expected POST, got %s", r.Method)
 		}
+		if r.URL.Path != "/api/v1/orgs/core/repos" {
+			t.Errorf("wrong path: %s", r.URL.Path)
+			http.NotFound(w, r)
+			return
+		}
 		var body testCreate
 		json.NewDecoder(r.Body).Decode(&body)
 		w.WriteHeader(http.StatusCreated)