diff --git a/packages/underscore-tests/common_test.js b/packages/underscore-tests/common_test.js
new file mode 100644
index 0000000000..2b17f97f0d
--- /dev/null
+++ b/packages/underscore-tests/common_test.js
@@ -0,0 +1,72 @@
+const list = [
+  { test: 'test-1', num: 1, even: false },
+  { test: 'test-2', num: 2, even: true },
+  { test: 'test-3', num: 3, even: false },
+  { test: 'test-4', num: 4, even: true }
+];
+
+const nums = [1,2,3,4];
+
+const numStrs = ['one', 'two', 'three'];
+
+Tinytest.add("underscore-tests - where", function (test) {
+  test.equal(_.where(list, { num: 1}), [{ test: 'test-1', num: 1, even: false }]);
+  test.equal(_.where(list, { even: true}), [{ test: 'test-2', num: 2, even: true }, { test: 'test-4', num: 4, even: true }]);
+});
+
+Tinytest.add("underscore-tests - findWhere", function (test) {
+  test.equal(_.findWhere(list, { num: 1}), { test: 'test-1', num: 1, even: false });
+  test.equal(_.findWhere(list, { even: true}), { test: 'test-2', num: 2, even: true });
+});
+
+Tinytest.add("underscore-tests - pluck", function (test) {
+  test.equal(_.pluck(list, 'num'), [1,2,3,4]);
+  test.equal(_.pluck(list, 'test'), ["test-1","test-2","test-3","test-4"]);
+});
+
+Tinytest.add("underscore-tests - max-min", function (test) {
+  test.equal(_.max(nums), 4);
+  test.equal(_.min(nums), 1);
+});
+
+Tinytest.add("underscore-tests - first-last", function (test) {
+  test.equal(_.last(nums), 4);
+  test.equal(_.first(nums), 1);
+});
+
+Tinytest.add("underscore-tests - sample", function (test) {
+  const sample = _.sample(nums);
+  test.isTrue(typeof sample === 'number' && nums.includes(sample));
+  const samplesThree = _.sample(nums, 3);
+  test.isTrue(samplesThree?.length === 3 && samplesThree.every(_s => nums.includes(_s)));
+});
+
+Tinytest.add("underscore-tests - groupBy", function (test) {
+  test.equal(_.groupBy(numStrs, 'length'), {"3":["one","two"],"5":["three"]});
+});
+
+Tinytest.add("underscore-tests - partition", function (test) {
+  test.equal(_.partition(nums, num => num % 2), [[1,3],[2,4]]);
+});
+
+Tinytest.add("underscore-tests - intersection", function (test) {
+  test.equal(_.intersection([1, 2, 3], [101, 2, 1, 10], [2, 1]), [1, 2]);
+});
+
+Tinytest.add("underscore-tests - partial", function (test) {
+  const subtract = function(a, b) { return b - a; };
+  const sub5 = _.partial(subtract, 5);
+  test.equal(sub5(20), 15);
+});
+
+Tinytest.add("underscore-tests - wrap", function (test) {
+  let hello = function(name) { return "hello: " + name; };
+  hello = _.wrap(hello, function(func) {
+    return "before, " + func("moe") + ", after";
+  });
+  test.equal(hello(), 'before, hello: moe, after');
+});
+
+Tinytest.add("underscore-tests - keys", function (test) {
+  test.equal(_.keys(list[0]), ["test","num","even"]);
+});
diff --git a/packages/underscore-tests/package.js b/packages/underscore-tests/package.js
index 7a3697633c..f3d344e9c8 100644
--- a/packages/underscore-tests/package.js
+++ b/packages/underscore-tests/package.js
@@ -7,5 +7,5 @@ Package.describe({
 
 Package.onTest(function (api) {
   api.use(['tinytest', 'underscore']);
-  api.addFiles('each_test.js');
+  api.addFiles(['common_test.js', 'each_test.js']);
 });
diff --git a/packages/underscore/underscore.js b/packages/underscore/underscore.js
index 6a9e39fe09..2f01b28eac 100644
--- a/packages/underscore/underscore.js
+++ b/packages/underscore/underscore.js
@@ -264,8 +264,8 @@
 
   // Convenience version of a common use case of `filter`: selecting only objects
   // containing specific `key:value` pairs.
-  _.where = function(obj, attrs) {
-    return _.find(obj, _.matches(attrs));
+  _.where = function (obj, attrs, first) {
+    return first ? _.find(obj, _.matches(attrs)) : _.filter(obj, _.matches(attrs));
   };
 
   // Convenience version of a common use case of `find`: getting the first object