diff --git a/rails-snippets-feature.el b/rails-snippets-feature.el
index f3839e6..69e432f 100644
--- a/rails-snippets-feature.el
+++ b/rails-snippets-feature.el
@@ -264,19 +264,21 @@
     (0 "tests" rails-functional-test-minor-mode-abbrev-table rails-unit-test-minor-mode-abbrev-table
        ("fix" "$${,rails-snippets-feature:fixture}(:$${one})$." "models(:name)")) ; functional tests
     (0 "shoulda" rails-functional-test-minor-mode-abbrev-table rails-unit-test-minor-mode-abbrev-table
-       ("cont" "context \"$${description}\" do\n$>setup do\n$>$${setup}\n$>end\n $>should \"$${should_desc}\" do\n $>$.\n$>end\n$>end" "context block with setup")
-       ("should" "should \"$${description}\" do\n $>$.\n$>end" "should block")
-       ("shoulde" "should_eventually \"$${description}\" do\n $>$.\n$>end" "should_eventually block")
+       ("cont" "context \"$${description}\" do\n$>setup do\n$>$${setup}\nend$>\n\n$>should$.\nend$>" "context block with setup")
+       ("should" "should \"$${description}\" do\n$>$.\nend$>" "should block")
+       ("shoulds" "should \"$${description}\" do\n$>flunk\nend$>\n\n$>shoulds$." "several should blocks")
+       ("shoulde" "should_eventually \"$${description}\" do\n $>$.\nend$>" "should_eventually block")
+       ("shouldes" "should_eventually \"$${description}\"\n$>shouldes$." "several should_eventually statements")
        ("laf" "load_all_fixtures" "load_all_fixtures")
        ("sat" "should_assign_to :$${variable}" "should_assign_to")
        ("savf" "should_allow_values_for :$${attribute}" "should_allow_values_for")
        ("sbt" "should_belong_to :$${object}" "should_belong_to")
-       ("sbr" "should_be_restful do |$${resource}|\n $>$${resource}.$.\n $>end" "should_be_restful {|resource| ... }")
-       ("selir" "should_ensure_length_in_range $${attribute}, ($${range})" "should_ensure_length_in_range")
-       ("sevir" "should_ensure_value_in_range $${attribute}, ($${range})" "should_ensure_value_in_range")
+       ("sbr" "should_be_restful do |$${resource}|\n $>$${resource}.$.\nend$>" "should_be_restful {|resource| ... }")
+       ("selir" "should_ensure_length_in_range :$${attribute}, ($${range})" "should_ensure_length_in_range")
+       ("sevir" "should_ensure_value_in_range :$${attribute}, ($${range})" "should_ensure_value_in_range")
        ("sho" "should_have_one :$${object}" "should_have_one")
-       ("shabtm" "should_have_and_belong_to_many" "should_have_and_belong_to_many")
-       ("shm" "should_have_many" "should_have_many")
+       ("shabtm" "should_have_and_belong_to_many :$${objects}" "should_have_and_belong_to_many")
+       ("shm" "should_have_many :$${objects}" "should_have_many")
        ("snstf" "should_not_set_the_flash" "should_not_set_the_flash")
        ("snat" "should_not_assign_to :$${variable}" "should_not_assign_to")
        ("snavf" "should_not_allow_values_for :$${attribute}" "should_not_allow_values_for")
@@ -284,8 +286,8 @@
        ("sraf" "should_render_a_form" "should_render_a_form")
        ("srdt" "should_redirect_to $${redirect}" "should_redirect_to")
        ("srt" "should_render_template :$${template}" "should_render_template")
-       ("sra" "should_require_attributes $${attribute}" "should_require_attributes")
-       ("srua" "should_require_unique_attributes $${attribute}" "should_require_unique_attributes")
+       ("sra" "should_require_attributes :$${attribute}" "should_require_attributes")
+       ("srua" "should_require_unique_attributes :$${attribute}" "should_require_unique_attributes")
        ("srw" "should_respond_with :$${response}" "should_respond_with")
        ("sstft" "should_set_the_flash_to $${value}" "should_set_the_flash_to")) ; shoulda tests
     (0 "assertions" rails-functional-test-minor-mode-abbrev-table rails-unit-test-minor-mode-abbrev-table