Finished up APM prototype and tests

Author: christkv

lib/apm.js

@@ -56,9 +56,8 @@ var Instrumentation = function(core, options, callback) {
     var instrumentations = []
 
     // Classes to support
-    var classes = [GridStore, Server, ReplSet, Mongos,
-      OrderedBulkOperation, UnorderedBulkOperation, CommandCursor, AggregationCursor,
-      Cursor, Collection, Db];
+    var classes = [GridStore, OrderedBulkOperation, UnorderedBulkOperation, 
+      CommandCursor, AggregationCursor, Cursor, Collection, Db];
 
     // Add instrumentations to the available list
     for(var i = 0; i < classes.length; i++) {
@@ -375,7 +374,6 @@ var Instrumentation = function(core, options, callback) {
             return self.emit('succeeded', command)
           }
 
-
           // Add our callback handler
           args.push(function(err, r) {
             if(err) {
@@ -464,6 +462,11 @@ Instrumentation.prototype.uninstrument = function() {
     var obj = this.overloads[i];
     obj.proto[obj.name] = obj.func;
   }
+
+  // Remove all listeners
+  this.removeAllListeners('started');
+  this.removeAllListeners('succeeded');
+  this.removeAllListeners('failed');
 }
 
 module.exports = Instrumentation;