diff --git a/app/assets/javascripts/darkswarm/services/products.js.coffee b/app/assets/javascripts/darkswarm/services/products.js.coffee
index cc4ffbf259..aec7b1cc3e 100644
--- a/app/assets/javascripts/darkswarm/services/products.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/products.js.coffee
@@ -44,5 +44,5 @@ Darkswarm.factory 'Products', ($resource, Enterprises, Dereferencer, Taxons, Car
           product.price = Math.min.apply(null, prices)
         product.hasVariants = product.variants?.length > 0
         
-        product.primaryImage = product.images[0]?.small_url
+        product.primaryImage = product.images[0]?.small_url if product.images
         product.primaryImageOrMissing = product.primaryImage || "/assets/noimage/small.png"
diff --git a/config/ng-test.conf.js b/config/ng-test.conf.js
index 33f95483cf..eadaf984ae 100644
--- a/config/ng-test.conf.js
+++ b/config/ng-test.conf.js
@@ -8,7 +8,6 @@ module.exports = function(config) {
       APPLICATION_SPEC,
       'app/assets/javascripts/shared/jquery-1.8.0.js', // TODO: Can we link to Rails' jquery?
       'app/assets/javascripts/shared/jquery.timeago.js',
-      'app/assets/javascripts/shared/mm-foundation-tpls-0.2.0-SNAPSHOT.js',
       'app/assets/javascripts/shared/angular-local-storage.js',
       'app/assets/javascripts/shared/bindonce.min.js',
       'app/assets/javascripts/shared/ng-infinite-scroll.min.js',
diff --git a/spec/javascripts/application_spec.js b/spec/javascripts/application_spec.js
index 44654e7b32..d9239c79ad 100644
--- a/spec/javascripts/application_spec.js
+++ b/spec/javascripts/application_spec.js
@@ -8,6 +8,7 @@
 //= require angular-backstretch.js
 //= require lodash.underscore.js
 //= require angular-flash.min.js
+//= require shared/mm-foundation-tpls-0.2.2.min.js
 //= require moment
 
 angular.module('templates', [])
diff --git a/spec/javascripts/unit/darkswarm/controllers/products_controller_spec.js.coffee b/spec/javascripts/unit/darkswarm/controllers/products_controller_spec.js.coffee
index 1d56a79d27..73ecd611ef 100644
--- a/spec/javascripts/unit/darkswarm/controllers/products_controller_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/controllers/products_controller_spec.js.coffee
@@ -3,6 +3,7 @@ describe 'ProductsCtrl', ->
   scope = null
   event = null
   Products = null
+  Cart = {}
 
   beforeEach ->
     module('Darkswarm')
@@ -15,7 +16,7 @@ describe 'ProductsCtrl', ->
         
     inject ($controller) ->
       scope = {}
-      ctrl = $controller 'ProductsCtrl', {$scope: scope, Products: Products, OrderCycle: OrderCycle}
+      ctrl = $controller 'ProductsCtrl', {$scope: scope, Products: Products, OrderCycle: OrderCycle, Cart: Cart}
 
   it 'fetches products from Products', ->
     expect(scope.Products.products).toEqual ['testy mctest']
diff --git a/spec/javascripts/unit/darkswarm/filters/filter_groups_spec.js.coffee b/spec/javascripts/unit/darkswarm/filters/filter_groups_spec.js.coffee
index e7e2614f7f..0e85fe27d3 100644
--- a/spec/javascripts/unit/darkswarm/filters/filter_groups_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/filters/filter_groups_spec.js.coffee
@@ -2,7 +2,7 @@ describe "filtering Groups", ->
   filterGroups = null
   groups = [{
     name: "test"
-    long_description: "roger"
+    description: "roger"
     enterprises: [{
         name: "kittens"
       }, {
@@ -10,7 +10,7 @@ describe "filtering Groups", ->
       }]
     }, {
     name: "blankness"
-    long_description: "in the sky"
+    description: "in the sky"
     enterprises: [{
         name: "ponies"
       }, {
diff --git a/spec/javascripts/unit/darkswarm/filters/strip_url_spec.js.coffee b/spec/javascripts/unit/darkswarm/filters/strip_url_spec.js.coffee
index f34df5cc71..ae0d6a7c8a 100644
--- a/spec/javascripts/unit/darkswarm/filters/strip_url_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/filters/strip_url_spec.js.coffee
@@ -6,11 +6,8 @@ describe 'filtering urls', ->
     inject ($filter) ->
       filter = $filter('stripUrl')
 
-  it "removes http and www", ->
-    expect(filter("http://www.footle.com")).toEqual "footle.com"
+  it "removes http", ->
+    expect(filter("http://footle.com")).toEqual "footle.com"
 
-  it "removes https and www", ->
-    expect(filter("https://www.footle.com")).toEqual "footle.com"
-
-  it "removes just www", ->
-    expect(filter("www.footle.com")).toEqual "footle.com"
+  it "removes https", ->
+    expect(filter("https://www.footle.com")).toEqual "www.footle.com"
diff --git a/spec/javascripts/unit/darkswarm/services/product_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/product_spec.js.coffee
index af384adcb6..237cbcd369 100644
--- a/spec/javascripts/unit/darkswarm/services/product_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/product_spec.js.coffee
@@ -55,6 +55,12 @@ describe 'Products service', ->
     $httpBackend.flush()
     expect(Cart.line_items[0].variant).toBe Products.products[0].variants[0]
 
+  it "sets primaryImageOrMissing when no images are provided", ->
+    $httpBackend.expectGET("/shop/products").respond([product])
+    $httpBackend.flush()
+    expect(Products.products[0].primaryImage).toBeUndefined()
+    expect(Products.products[0].primaryImageOrMissing).toEqual "/assets/noimage/small.png"
+
   describe "determining the price to display for a product", ->
     it "displays the product price when the product does not have variants", ->
       $httpBackend.expectGET("/shop/products").respond([product])
@@ -66,4 +72,3 @@ describe 'Products service', ->
       $httpBackend.expectGET("/shop/products").respond([product])
       $httpBackend.flush()
       expect(Products.products[0].price).toEqual 22
-