diff --git a/spec/unit/provider/package_types/package_types_spec.rb b/spec/unit/provider/package_types/package_types_spec.rb
deleted file mode 100644
index 1cf806f..0000000
--- a/spec/unit/provider/package_types/package_types_spec.rb
+++ /dev/null
@@ -1,222 +0,0 @@
-require 'spec_helper'
-require 'puppet/type/entropy_mask'
-require 'puppet/type/entropy_unmask'
-require 'puppet/type/entropy_splitdebug'
-require 'puppet/type/entropy_splitdebug_mask'
-
-types = {
-  :entropy_mask            => Puppet::Type::Entropy_mask,
-  :entropy_unmask          => Puppet::Type::Entropy_unmask,
-  :entropy_splitdebug      => Puppet::Type::Entropy_splitdebug,
-  :entropy_splitdebug_mask => Puppet::Type::Entropy_splitdebug_mask,
-}
-
-default_targets = {
-  :entropy_mask            => '/etc/entropy/packages/package.mask',
-  :entropy_unmask          => '/etc/entropy/packages/package.unmask',
-  :entropy_splitdebug      => '/etc/entropy/packages/package.splitdebug',
-  :entropy_splitdebug_mask => '/etc/entropy/packages/package.splitdebug.mask',
-}
-
-types.each do |type_name, type|
-  describe Puppet::Type.type(type_name).provider(:parsed) do
-    before do
-      described_class.stubs(:filetype).returns(Puppet::Util::FileType::FileTypeRam)
-      described_class.stubs(:filetype=)
-      @default_target = described_class.default_target
-    end
-
-    describe "should have a default target of #{default_targets[type_name]}" do
-      it do
-        expect(described_class.default_target).to eq(default_targets[type_name])
-      end
-    end
-
-    describe "when parsing" do
-      it "should parse out the name" do
-        line = 'app-admin/foobar ## Puppet Name: foobar'
-        expect(described_class.parse_line(line)[:name]).to eq('foobar')
-      end
-
-      context "with just a package name" do
-        line = 'app-admin/foobar ## Puppet Name: foobar'
-        parsed = described_class.parse_line(line)
-
-        it "should parse out the package name" do
-          expect(parsed[:package]).to eq('app-admin/foobar')
-        end
-
-        it "should have all other parameters undefined" do
-          [:operator, :version, :slot, :use, :tag, :repo].each do |param|
-            expect(parsed[param]).to be_nil
-          end
-        end
-      end
-
-      context "with a versioned package" do
-        line = 'app-admin/foobar-1.2.3_alpha1-r1 ## Puppet Name: foobar'
-        parsed = described_class.parse_line(line)
-
-        it "should parse out the package name" do
-          expect(parsed[:package]).to eq('app-admin/foobar')
-        end
-
-        it "should parse out the version" do
-          expect(parsed[:version]).to eq('1.2.3_alpha1-r1')
-        end
-
-        it "should have all other parameters undefined" do
-          [:operator, :slot, :use, :tag, :repo].each do |param|
-            expect(parsed[param]).to be_nil
-          end
-        end
-      end
-
-      context "with a package range" do
-        line = '>=app-admin/foobar-1.2.3_alpha1-r1 ## Puppet Name: foobar'
-        parsed = described_class.parse_line(line)
-
-        it "should parse out the package name" do
-          expect(parsed[:package]).to eq('app-admin/foobar')
-        end
-
-        it "should parse out the version" do
-          expect(parsed[:version]).to eq('1.2.3_alpha1-r1')
-        end
-
-        it "should parse out the operator" do
-          expect(parsed[:operator]).to eq('>=')
-        end
-
-        it "should have all other parameters undefined" do
-          [:slot, :use, :tag, :repo].each do |param|
-            expect(parsed[param]).to be_nil
-          end
-        end
-      end
-
-      context "with a slotted package" do
-        line = 'app-admin/foobar:1.1 ## Puppet Name: foobar'
-        parsed = described_class.parse_line(line)
-
-        it "should parse out the package name" do
-          expect(parsed[:package]).to eq('app-admin/foobar')
-        end
-
-        it "should parse out the slot" do
-          expect(parsed[:slot]).to eq('1.1')
-        end
-
-        it "should have all other parameters undefined" do
-          [:operator, :version, :use, :tag, :repo].each do |param|
-            expect(parsed[param]).to be_nil
-          end
-        end
-      end
-
-      context "with a package with use restrictions" do
-        line = 'app-admin/foobar[-foo,bar] ## Puppet Name: foobar'
-        parsed = described_class.parse_line(line)
-
-        it "should parse out the package name" do
-          expect(parsed[:package]).to eq('app-admin/foobar')
-        end
-
-        it "should parse out the use" do
-          expect(parsed[:use]).to eq('-foo,bar')
-        end
-
-        it "should have all other parameters undefined" do
-          [:operator, :version, :slot, :tag, :repo].each do |param|
-            expect(parsed[param]).to be_nil
-          end
-        end
-      end
-
-      context "with a tagged package" do
-        line = 'app-admin/foobar#server ## Puppet Name: foobar'
-        parsed = described_class.parse_line(line)
-
-        it "should parse out the package name" do
-          expect(parsed[:package]).to eq('app-admin/foobar')
-        end
-
-        it "should parse out the tag" do
-          expect(parsed[:tag]).to eq('server')
-        end
-
-        it "should have all other parameters undefined" do
-          [:operator, :version, :slot, :use, :repo].each do |param|
-            expect(parsed[param]).to be_nil
-          end
-        end
-      end
-
-      context "with a package from a specific repo" do
-        line = 'app-admin/foobar::community ## Puppet Name: foobar'
-        parsed = described_class.parse_line(line)
-
-        it "should parse out the package name" do
-          expect(parsed[:package]).to eq('app-admin/foobar')
-        end
-
-        it "should parse out the repo" do
-          expect(parsed[:repo]).to eq('community')
-        end
-
-        it "should have all other parameters undefined" do
-          [:operator, :version, :slot, :use, :tag].each do |param|
-            expect(parsed[param]).to be_nil
-          end
-        end
-      end
-
-      context "with everything" do
-        line = '>=app-admin/foobar-1.2.3a_alpha1-r1:1[-foo]#server::community ## Puppet Name: foobar'
-        parsed = described_class.parse_line(line)
-
-        expected = {
-          :name     => 'foobar',
-          :operator => '>=',
-          :package  => 'app-admin/foobar',
-          :version  => '1.2.3a_alpha1-r1',
-          :slot     => '1',
-          :use      => '-foo',
-          :tag      => 'server',
-          :repo     => 'community',
-        }
-
-        it "should parse out all parameters" do
-          expected.each do |param, value|
-            expect(parsed[param]).to eq(value)
-          end
-        end
-      end
-
-    end
-
-    describe "when flushing" do
-      before :each do
-        @ramfile = Puppet::Util::FileType::FileTypeRam.new(@default_target)
-        File.stubs(:exist?).with(default_targets[type_name]).returns(true)
-        described_class.any_instance.stubs(:target_object).returns(@ramfile)
-
-        resource = type.new(:name => 'test', :package => 'app-admin/foobar')
-        resource.stubs(:should).with(:target).returns(@default_target)
-
-        @providerinstance = described_class.new(resource)
-        @providerinstance.ensure = :present
-        #@providerinstance.package = 'app-admin/foobar'
-      end
-
-      after :each do
-        described_class.clear
-      end
-
-      it "should write an atom name to disk" do
-        @providerinstance.flush
-        expect(@ramfile.read.chomp).to eq ('app-admin/foobar ## Puppet Name: test')
-      end
-    end
-  end
-end
diff --git a/spec/unit/provider/package_types/parsed_spec.rb b/spec/unit/provider/package_types/parsed_spec.rb
new file mode 100644
index 0000000..531fb21
--- /dev/null
+++ b/spec/unit/provider/package_types/parsed_spec.rb
@@ -0,0 +1,304 @@
+require 'spec_helper'
+require 'puppet/type/entropy_mask'
+require 'puppet/type/entropy_unmask'
+require 'puppet/type/entropy_splitdebug'
+require 'puppet/type/entropy_splitdebug_mask'
+
+types = {
+    :entropy_mask            => Puppet::Type::Entropy_mask,
+    :entropy_unmask          => Puppet::Type::Entropy_unmask,
+    :entropy_splitdebug      => Puppet::Type::Entropy_splitdebug,
+    :entropy_splitdebug_mask => Puppet::Type::Entropy_splitdebug_mask,
+}
+
+default_targets = {
+    :entropy_mask            => '/etc/entropy/packages/package.mask',
+    :entropy_unmask          => '/etc/entropy/packages/package.unmask',
+    :entropy_splitdebug      => '/etc/entropy/packages/package.splitdebug',
+    :entropy_splitdebug_mask => '/etc/entropy/packages/package.splitdebug.mask',
+}
+
+types.each do |type_name, type|
+  describe Puppet::Type.type(type_name).provider(:parsed) do
+    before do
+      described_class.stubs(:filetype).returns(Puppet::Util::FileType::FileTypeRam)
+      described_class.stubs(:filetype=)
+      @default_target = described_class.default_target
+    end
+
+    describe "should have a default target of #{default_targets[type_name]}" do
+      it do
+        expect(described_class.default_target).to eq(default_targets[type_name])
+      end
+    end
+
+    describe 'when parsing' do
+      it 'should parse out the name' do
+        line = 'app-admin/foobar ## Puppet Name: foobar'
+        expect(described_class.parse_line(line)[:name]).to eq('foobar')
+      end
+
+      context 'with just a package name' do
+        line = 'app-admin/foobar ## Puppet Name: foobar'
+        parsed = described_class.parse_line(line)
+
+        it 'should parse out the package name' do
+          expect(parsed[:package]).to eq('app-admin/foobar')
+        end
+
+        it 'should have all other parameters undefined' do
+          [:operator, :version, :slot, :use, :tag, :repo].each do |param|
+            expect(parsed[param]).to be_nil
+          end
+        end
+      end
+
+      context 'with a versioned package' do
+        line = 'app-admin/foobar-1.2.3_alpha1-r1 ## Puppet Name: foobar'
+        parsed = described_class.parse_line(line)
+
+        it 'should parse out the package name' do
+          expect(parsed[:package]).to eq('app-admin/foobar')
+        end
+
+        it 'should parse out the version' do
+          expect(parsed[:version]).to eq('1.2.3_alpha1-r1')
+        end
+
+        it 'should have all other parameters undefined' do
+          [:operator, :slot, :use, :tag, :repo].each do |param|
+            expect(parsed[param]).to be_nil
+          end
+        end
+      end
+
+      context 'with a package range' do
+        line = '>=app-admin/foobar-1.2.3_alpha1-r1 ## Puppet Name: foobar'
+        parsed = described_class.parse_line(line)
+
+        it 'should parse out the package name' do
+          expect(parsed[:package]).to eq('app-admin/foobar')
+        end
+
+        it 'should parse out the version' do
+          expect(parsed[:version]).to eq('1.2.3_alpha1-r1')
+        end
+
+        it 'should parse out the operator' do
+          expect(parsed[:operator]).to eq('>=')
+        end
+
+        it 'should have all other parameters undefined' do
+          [:slot, :use, :tag, :repo].each do |param|
+            expect(parsed[param]).to be_nil
+          end
+        end
+      end
+
+      context 'with a slotted package' do
+        line = 'app-admin/foobar:1.1 ## Puppet Name: foobar'
+        parsed = described_class.parse_line(line)
+
+        it 'should parse out the package name' do
+          expect(parsed[:package]).to eq('app-admin/foobar')
+        end
+
+        it 'should parse out the slot' do
+          expect(parsed[:slot]).to eq('1.1')
+        end
+
+        it 'should have all other parameters undefined' do
+          [:operator, :version, :use, :tag, :repo].each do |param|
+            expect(parsed[param]).to be_nil
+          end
+        end
+      end
+
+      context 'with a package with use restrictions' do
+        line = 'app-admin/foobar[-foo,bar] ## Puppet Name: foobar'
+        parsed = described_class.parse_line(line)
+
+        it 'should parse out the package name' do
+          expect(parsed[:package]).to eq('app-admin/foobar')
+        end
+
+        it 'should parse out the use' do
+          expect(parsed[:use]).to eq('-foo,bar')
+        end
+
+        it 'should have all other parameters undefined' do
+          [:operator, :version, :slot, :tag, :repo].each do |param|
+            expect(parsed[param]).to be_nil
+          end
+        end
+      end
+
+      context 'with a tagged package' do
+        line = 'app-admin/foobar#server ## Puppet Name: foobar'
+        parsed = described_class.parse_line(line)
+
+        it 'should parse out the package name' do
+          expect(parsed[:package]).to eq('app-admin/foobar')
+        end
+
+        it 'should parse out the tag' do
+          expect(parsed[:tag]).to eq('server')
+        end
+
+        it 'should have all other parameters undefined' do
+          [:operator, :version, :slot, :use, :repo].each do |param|
+            expect(parsed[param]).to be_nil
+          end
+        end
+      end
+
+      context 'with a package from a specific repo' do
+        line = 'app-admin/foobar::community ## Puppet Name: foobar'
+        parsed = described_class.parse_line(line)
+
+        it 'should parse out the package name' do
+          expect(parsed[:package]).to eq('app-admin/foobar')
+        end
+
+        it 'should parse out the repo' do
+          expect(parsed[:repo]).to eq('community')
+        end
+
+        it 'should have all other parameters undefined' do
+          [:operator, :version, :slot, :use, :tag].each do |param|
+            expect(parsed[param]).to be_nil
+          end
+        end
+      end
+
+      context 'with everything' do
+        line = '>=app-admin/foobar-1.2.3a_alpha1-r1:1[-foo]#server::community ## Puppet Name: foobar'
+        parsed = described_class.parse_line(line)
+
+        expected = {
+          :name     => 'foobar',
+          :operator => '>=',
+          :package  => 'app-admin/foobar',
+          :version  => '1.2.3a_alpha1-r1',
+          :slot     => '1',
+          :use      => '-foo',
+          :tag      => 'server',
+          :repo     => 'community',
+        }
+
+        it 'should parse out all parameters' do
+          expected.each do |param, value|
+            expect(parsed[param]).to eq(value)
+          end
+        end
+      end
+
+    end
+
+    describe 'when flushing' do 
+      before :each do
+        @ramfile = Puppet::Util::FileType::FileTypeRam.new(@default_target)
+        File.stubs(:exist?).with(default_targets[type_name]).returns(true)
+        described_class.any_instance.stubs(:target_object).returns(@ramfile)
+      end
+
+      after :each do
+        described_class.clear
+      end
+
+      it 'should output a single package entry' do
+        resource = {
+          :record_type => :parsed,
+          :name        => 'test',
+          :package     => 'app-admin/foobar',
+        }
+        expect(described_class.to_line(resource)).to eq ('app-admin/foobar ## Puppet Name: test')
+      end
+
+      it 'should output a versioned package entry' do
+        resource = {
+          :record_type => :parsed,
+          :name        => 'test',
+          :package     => 'app-admin/foobar',
+          :version     => '1.2.3',
+        }
+        expect(described_class.to_line(resource)).to eq ('app-admin/foobar-1.2.3 ## Puppet Name: test')
+      end
+
+      it 'should output a ranged versioned package entry' do
+        resource = {
+          :record_type => :parsed,
+          :name        => 'test',
+          :package     => 'app-admin/foobar',
+          :version     => '1.2.3',
+          :operator    => '>=',
+        }
+        expect(described_class.to_line(resource)).to eq ('>=app-admin/foobar-1.2.3 ## Puppet Name: test')
+      end
+
+      it 'should output a use-restricted package entry' do
+        resource = {
+          :record_type => :parsed,
+          :name        => 'test',
+          :package     => 'app-admin/foobar',
+          :use         => '-foo,bar',
+        }
+        expect(described_class.to_line(resource)).to eq ('app-admin/foobar[-foo,bar] ## Puppet Name: test')
+      end
+
+      it 'should output a slotted package entry' do
+        resource = {
+          :record_type => :parsed,
+          :name        => 'test',
+          :package     => 'app-admin/foobar',
+          :slot        => '1.1',
+        }
+        expect(described_class.to_line(resource)).to eq ('app-admin/foobar:1.1 ## Puppet Name: test')
+      end
+
+      it 'should output a tagged package entry' do
+        resource = {
+          :record_type => :parsed,
+          :name        => 'test',
+          :package     => 'app-admin/foobar',
+          :tag         => 'server',
+        }
+        expect(described_class.to_line(resource)).to eq ('app-admin/foobar#server ## Puppet Name: test')
+      end
+
+      it 'should output a repo-specific package entry' do
+        resource = {
+          :record_type => :parsed,
+          :name        => 'test',
+          :package     => 'app-admin/foobar',
+          :repo        => 'community',
+        }
+        expect(described_class.to_line(resource)).to eq ('app-admin/foobar::community ## Puppet Name: test')
+      end
+
+      it 'should output a whole-repo entry' do
+        resource = {
+          :record_type => :parsed,
+          :name        => 'test',
+          :repo        => 'community',
+        }
+        expect(described_class.to_line(resource)).to eq ('::community ## Puppet Name: test')
+      end
+
+      it 'should output all fields for a package entry' do
+        resource = {
+          :record_type => :parsed,
+          :name        => 'test',
+          :package     => 'app-admin/foobar',
+          :operator    => '>=',
+          :version     => '1.2.3',
+          :slot        => '1.1',
+          :use         => '-foo,bar',
+          :tag         => 'server',
+          :repo        => 'community',
+        }
+        expect(described_class.to_line(resource)).to eq ('>=app-admin/foobar-1.2.3:1.1[-foo,bar]#server::community ## Puppet Name: test')
+      end
+    end
+  end
+end
diff --git a/spec/types/enman_repo_spec.rb b/spec/unit/type/enman_repo_spec.rb
similarity index 100%
rename from spec/types/enman_repo_spec.rb
rename to spec/unit/type/enman_repo_spec.rb
diff --git a/spec/types/entropy_keywords_spec.rb b/spec/unit/type/entropy_keywords_spec.rb
similarity index 100%
rename from spec/types/entropy_keywords_spec.rb
rename to spec/unit/type/entropy_keywords_spec.rb
diff --git a/spec/types/package_types_spec.rb b/spec/unit/type/package_types_spec.rb
similarity index 100%
rename from spec/types/package_types_spec.rb
rename to spec/unit/type/package_types_spec.rb