diff --git a/lib/acts_as_searchable.rb b/lib/acts_as_searchable.rb
index ee8fa8b..7ee386e 100644
--- a/lib/acts_as_searchable.rb
+++ b/lib/acts_as_searchable.rb
@@ -7,6 +7,7 @@ module ActsAsSearchable
       return if !ACTS_AS_SEARCHABLE_ENABLED
 
       if (!options[:fields])
+		    options[:additional_fields] ||= []
         options[:additional_fields] |= [{:schema_name => :string}]
       else
         options[:fields] << {:schema_name => :string}
diff --git a/test/unit/acts_as_searchable_test.rb b/test/unit/acts_as_searchable_test.rb
new file mode 100644
index 0000000..703be80
--- /dev/null
+++ b/test/unit/acts_as_searchable_test.rb
@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+
+class ActsAsSearchableTest < ActiveSupport::TestCase
+
+  def setup
+		@test_model = Class.new ActiveRecord::Base
+	end
+
+  def silent
+		# http://mentalized.net/journal/2010/04/02/suppress_warnings_from_ruby/
+		original_verbosity = $VERBOSE
+    $VERBOSE = nil
+    result = yield
+    $VERBOSE = original_verbosity
+    return result
+  end
+
+	should 'be enabled by default' do
+		assert ActsAsSearchable::ClassMethods::ACTS_AS_SEARCHABLE_ENABLED, true
+  end
+
+  should 'not be searchable when disabled' do
+		# suppress warning about already initialized constant
+		silent { ActsAsSearchable::ClassMethods::ACTS_AS_SEARCHABLE_ENABLED = false }
+		
+    @test_model.expects(:acts_as_solr).never
+		@test_model.acts_as_searchable
+  end
+
+  should 'correctly pass options to search engine' do
+    options = {:fields => [{:name => :text}]}
+		@test_model.expects(:acts_as_solr).with(options)
+		@test_model.acts_as_searchable options
+  end
+
+	should 'always include schema name as a field' do
+		@test_model.expects(:acts_as_solr).with(has_entry(:fields, [{:field1 => :text}, {:schema_name => :string}]))
+		@test_model.acts_as_searchable :fields => [{:field1 => :text}]
+		# ...even with no fields
+		@test_model = Class.new ActiveRecord::Base
+		@test_model.expects(:acts_as_solr).with(has_entry(:additional_fields, [{:schema_name => :string}]))
+		@test_model.acts_as_searchable
+  end
+
+end
--
libgit2 0.21.2