diff --git a/Gemfile.lock b/Gemfile.lock
index 2860bb168..4c3c1920e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -151,7 +151,7 @@ GEM
     columnize (0.3.2)
     configuration (1.1.0)
     crack (0.1.8)
-    cucumber (0.9.3)
+    cucumber (0.9.4)
       builder (~> 2.1.2)
       diff-lcs (~> 1.1.2)
       gherkin (~> 2.2.9)
@@ -311,18 +311,16 @@ GEM
     rake (0.8.7)
     rest-client (1.6.1)
       mime-types (>= 1.16)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-    rspec-rails (2.0.1)
-      rspec (~> 2.0.0)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
+    rspec-rails (2.1.0)
+      rspec (~> 2.1.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
diff --git a/spec/javascripts/aspect-edit-spec.js b/spec/javascripts/aspect-edit-spec.js
index e71f2dbf2..ed03777e1 100644
--- a/spec/javascripts/aspect-edit-spec.js
+++ b/spec/javascripts/aspect-edit-spec.js
@@ -14,24 +14,41 @@ describe("AspectEdit", function() {
       AspectEdit.initialize();
       expect($.fn.droppable).toHaveBeenCalledWith({hoverClass: 'active', drop: AspectEdit.onDropMove});
       expect($.fn.droppable.calls[0].object.selector).toEqual(".aspect ul.dropzone");
-// This would be AWESOME:
-//      expect($.fn.droppable)
-//        .toHaveBeenCalled()
-//          .on(".aspect ul.dropzone")
-//          .with({});
     });
+    it("sets up the click event on .delete", function() {
+      spyOn($.fn, "live");
+      AspectEdit.initialize();
+      expect($.fn.live).toHaveBeenCalledWith("click", AspectEdit.deletePerson);
+      expect($.fn.live.calls[0].object.selector).toEqual(".delete");
+    });
+    it("sets up the focus event on aspect name", function() {
+      spyOn($.fn, "live");
+      AspectEdit.initialize();
+      expect($.fn.live).toHaveBeenCalledWith('focus', AspectEdit.changeName);
+      expect($.fn.live.calls[1].object.selector).toEqual(".aspect h3");
+    })
   });
 
   describe("startDrag", function() {
+    beforeEach(function() {
+      $('#jasmine_content').html(
+'<li class="person ui-draggable" data-aspect_id="4cae42e12367bca44e000005" data-guid="4cae42d32367bca44e000003" style="top: 0px; left: 0px; ">' +
+'  <img alt="Alexander Hamiltom" class="avatar" data-person_id="4cae42d32367bca44e000003" src="/images/user/default.png?1287542906" original-title="Alexander Hamiltom" style="height: 70px; width: 70px; opacity: 1; display: inline; ">' +
+'</li>'
+        );
+    });
     it("animates the image", function() {
-      $('#jasmine_content').html('<ul><li class="person ui-draggable" data-aspect_id="4cae42e12367bca44e000005" data-guid="4cae42d32367bca44e000003" style="top: 0px; left: 0px; ">' +
-                  '<img alt="Alexander Hamiltom" class="avatar" data-person_id="4cae42d32367bca44e000003" src="/images/user/default.png?1287542906" original-title="Alexander Hamiltom" style="height: 70px; width: 70px; opacity: 1; display: inline; ">' +
-                '</li></ul>');
       spyOn(AspectEdit, "animateImage");
       $.proxy(AspectEdit.startDrag, $('.person.ui-draggable'))();
       expect(AspectEdit.animateImage).toHaveBeenCalled();
       expect(AspectEdit.animateImage.mostRecentCall.args[0]).toHaveClass("avatar");
     });
+    it("fades in the drag and drop text", function() {
+      spyOn($.fn, "fadeIn");
+      $.proxy(AspectEdit.startDrag, $('.person.ui-draggable'))();
+      expect($.fn.fadeIn).toHaveBeenCalledWith(100);
+      expect($.fn.fadeIn.mostRecentCall.object.selector).toEqual(".draggable_info");
+    });
   });
 
   describe("decrementRequestsCounter", function() {
diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml
index db1541e3f..4342783d6 100644
--- a/spec/javascripts/support/jasmine.yml
+++ b/spec/javascripts/support/jasmine.yml
@@ -13,6 +13,7 @@
 src_files:
   - public/javascripts/vendor/jquery142.js
   - public/javascripts/vendor/jquery-ui-1.8.4.custom.min.js
+  - public/javascripts/vendor/jquery.tipsy.js
   - public/javascripts/aspect-edit.js
 
 # stylesheets