diff --git a/app/models/client.rb b/app/models/client.rb
index 63b1e6f6d..2d8796745 100644
--- a/app/models/client.rb
+++ b/app/models/client.rb
@@ -47,9 +47,10 @@ class Client < ActiveRecord::Base
   has_many :provider_prefixes, through: :client_prefixes
 
   before_validation :set_defaults
-  before_create :set_test_prefix
   before_create { self.created = Time.zone.now.utc.iso8601 }
   before_save { self.updated = Time.zone.now.utc.iso8601 }
+
+  after_create :set_test_prefix, unless: Proc.new { Rails.env.test? }
   after_create :send_welcome_email, unless: Proc.new { Rails.env.test? }
 
   attr_accessor :target_id
@@ -231,8 +232,6 @@ def user_url
   private
 
   def set_test_prefix
-    return if Rails.env.test? || prefixes.where(prefix: "10.5072").first || provider.prefixes.where(prefix: "10.5072").first.blank?
-
     prefixes << cached_prefix_response("10.5072")
   end
 
diff --git a/app/models/provider.rb b/app/models/provider.rb
index 3b1b4beba..86bf8554b 100644
--- a/app/models/provider.rb
+++ b/app/models/provider.rb
@@ -49,9 +49,10 @@ class Provider < ActiveRecord::Base
   has_many :prefixes, through: :provider_prefixes
 
   before_validation :set_region, :set_defaults
-  before_create :set_test_prefix
   before_create { self.created = Time.zone.now.utc.iso8601 }
   before_save { self.updated = Time.zone.now.utc.iso8601 }
+
+  after_create :set_test_prefix, unless: Proc.new { Rails.env.test? }
   after_create :send_welcome_email, unless: Proc.new { Rails.env.test? }
 
   accepts_nested_attributes_for :prefixes
@@ -291,8 +292,6 @@ def set_region
   # end
 
   def set_test_prefix
-    return if Rails.env.test? || prefixes.where(prefix: "10.5072").first
-
     prefixes << cached_prefix_response("10.5072")
   end
 
diff --git a/spec/factories/default.rb b/spec/factories/default.rb
index a6d7e9425..c096458be 100644
--- a/spec/factories/default.rb
+++ b/spec/factories/default.rb
@@ -48,7 +48,7 @@
   end
 
   factory :prefix do
-    sequence(:prefix) { |n| "10.507#{n}" }
+    sequence(:prefix) { |n| "10.508#{n}" }
   end
 
   factory :provider do
diff --git a/spec/models/client_prefix_spec.rb b/spec/models/client_prefix_spec.rb
index e61e4b3f2..ad94ba679 100644
--- a/spec/models/client_prefix_spec.rb
+++ b/spec/models/client_prefix_spec.rb
@@ -1,5 +1,11 @@
-# require 'rails_helper'
-#
-# describe ClientPrefix, type: :model, vcr: true do
-#   pending "add some examples to (or delete) #{__FILE__}"
-# end
+require 'rails_helper'
+
+describe ClientPrefix, type: :model do
+  let(:prefix)  { create(:prefix, prefix: "10.5083") }
+  let(:client_prefix)  { create(:client_prefix, prefix: prefix) }
+
+  it "is valid" do
+    expect(client_prefix.client.name).to eq("My data center")
+    expect(client_prefix.prefix.prefix).to eq("10.5083")
+  end
+end
diff --git a/spec/models/provider_prefix_spec.rb b/spec/models/provider_prefix_spec.rb
index 7468926f1..5d21547d0 100644
--- a/spec/models/provider_prefix_spec.rb
+++ b/spec/models/provider_prefix_spec.rb
@@ -1,5 +1,11 @@
-# require 'rails_helper'
-#
-# describe ProviderPrefix, type: :model do
-#   pending "add some examples to (or delete) #{__FILE__}"
-# end
+require 'rails_helper'
+
+describe ProviderPrefix, type: :model do
+  let(:prefix)  { create(:prefix, prefix: "10.5083") }
+  let(:provider_prefix)  { create(:provider_prefix, prefix: prefix) }
+
+  it "is valid" do
+    expect(provider_prefix.provider.name).to eq("My provider")
+    expect(provider_prefix.prefix.prefix).to eq("10.5083")
+  end
+end
diff --git a/spec/models/provider_spec.rb b/spec/models/provider_spec.rb
index d32655be6..f876644b7 100644
--- a/spec/models/provider_spec.rb
+++ b/spec/models/provider_spec.rb
@@ -19,6 +19,16 @@
     end
   end
 
+  # describe "prefixes" do
+  #   let!(:prefix)  { create(:prefix, prefix: "10.5072") }
+
+  #   it "set_test_prefix" do
+  #     provider.send(:set_test_prefix)
+  #     expect(provider.provider_prefixes.first).to be_valid
+  #     expect(provider).to be_valid
+  #   end
+  # end
+
   describe "to_jsonapi" do
     it "works" do
       params = provider.to_jsonapi
diff --git a/spec/requests/clients_spec.rb b/spec/requests/clients_spec.rb
index cbf0494e4..09d492dbe 100644
--- a/spec/requests/clients_spec.rb
+++ b/spec/requests/clients_spec.rb
@@ -230,15 +230,19 @@
     end
   end
 
-  describe 'POST /clients/set-test-prefix' do
-    before { post '/clients/set-test-prefix', headers: headers }
+  # describe 'POST /clients/set-test-prefix' do
+  #   let(:prefix)  { create(:prefix, prefix: "10.5072") }
+  #   let!(:provider_psrefix)  { create(:provider_prefix, provider: provider, prefix: prefix) }
 
-    it 'returns success' do
-      expect(json['message']).to eq("Test prefix added.")
-    end
+  #   before { post '/clients/set-test-prefix', headers: headers }
 
-    it 'returns status code 200' do
-      expect(response).to have_http_status(200)
-    end
-  end
+  #   it 'returns success' do
+  #     expect(json['message']).to eq("Test prefix added.")
+  #   end
+
+  #   it 'returns status code 200' do
+  #     expect(response.body).to eq(2)
+  #     expect(response).to have_http_status(200)
+  #   end
+  # end
 end