diff --git a/spec/models/concerns/by_organization_scope_spec.rb b/spec/models/concerns/by_organization_scope_spec.rb
index a1799b3861..ca76c999f7 100644
--- a/spec/models/concerns/by_organization_scope_spec.rb
+++ b/spec/models/concerns/by_organization_scope_spec.rb
@@ -1,7 +1,21 @@
 require "rails_helper"
 
 RSpec.describe ByOrganizationScope, type: :model do
-  # TODO: Add tests for ByOrganizationScope
+  describe ".by_organization" do
+    let(:casa_org) { create(:casa_org) }
+    let(:other_casa_org) { create(:casa_org) }
 
-  pending "add some tests for ByOrganizationScope"
+    let!(:casa_case_in_org) { create(:casa_case, casa_org: casa_org) }
+    let!(:casa_case_in_other_org) { create(:casa_case, casa_org: other_casa_org) }
+
+    it "returns only the records belonging to the given organization" do
+      expect(CasaCase.by_organization(casa_org)).to contain_exactly(casa_case_in_org)
+    end
+
+    it "returns no records for an organization without records" do
+      empty_casa_org = create(:casa_org)
+
+      expect(CasaCase.by_organization(empty_casa_org)).to be_empty
+    end
+  end
 end
diff --git a/spec/models/concerns/roles_spec.rb b/spec/models/concerns/roles_spec.rb
index 58d771c72d..5bffe6b69a 100644
--- a/spec/models/concerns/roles_spec.rb
+++ b/spec/models/concerns/roles_spec.rb
@@ -1,7 +1,15 @@
 require "rails_helper"
 
 RSpec.describe Roles, type: :model do
-  # TODO: Add tests for Roles
+  describe "#role" do
+    it "returns the titleized model name for each user type" do
+      expect(build(:volunteer).role).to eq "Volunteer"
+      expect(build(:supervisor).role).to eq "Supervisor"
+      expect(build(:casa_admin).role).to eq "Casa Admin"
+    end
 
-  pending "add some tests for Roles"
+    it "returns the titleized model name for an all casa admin" do
+      expect(build(:all_casa_admin).role).to eq "All Casa Admin"
+    end
+  end
 end