diff --git a/test/index.html b/test/index.html
index 0c745c6325..2cf008aa2d 100644
--- a/test/index.html
+++ b/test/index.html
@@ -502,6 +502,10 @@
       </div>
     {{/action }}
   </script>
+  <script type='text/x-tmpl-mustache' id='file-view'>
+    <span class='paperclip icon'></span>
+    <span class='fileName' alt='{{ fileName }}' title='{{ altText }}'>{{ fileName }}</a>
+  </script>
 
 
   <script type="text/javascript" src="../js/components.js"></script>
diff --git a/test/views/attachment_view_test.js b/test/views/attachment_view_test.js
index dde939f1b6..dad79bafe1 100644
--- a/test/views/attachment_view_test.js
+++ b/test/views/attachment_view_test.js
@@ -1,11 +1,17 @@
 describe('AttachmentView', function() {
 
-  it('should render a data url for arbitrary content', function() {
-    var attachment = { contentType: 'arbitrary/content' };
-    var view = new Whisper.AttachmentView({model: attachment}).render();
-    assert.equal(view.el.firstChild.tagName, "A");
+  describe('with arbitrary files', function() {
+      it('should render a file view', function() {
+        var attachment = { contentType: 'arbitrary/content' };
+        var view = new Whisper.AttachmentView({model: attachment}).render();
+        assert.match(view.el.innerHTML, /fileView/);
+      });
+      it('should display the filename if present', function() {
+        var attachment = { contentType: 'arbitrary/content', fileName: 'foo.txt' };
+        var view = new Whisper.AttachmentView({model: attachment}).render();
+        assert.match(view.el.innerHTML, /foo.txt/);
+      });
   });
-
   it('should render an image for images', function() {
     var now = new Date().getTime();
     var attachment = { contentType: 'image/png', data: 'grumpy cat' };
@@ -13,7 +19,18 @@ describe('AttachmentView', function() {
     assert.equal(view.el.firstChild.tagName, "IMG");
   });
 
-  it('shoud have correct filename format', function() {
+  it('should display a filename', function() {
+    var epoch = new Date((new Date(0)).getTimezoneOffset() * 60 * 1000);
+    var attachment = { contentType: 'image/png', data: 'grumpy cat' };
+    var result = new Whisper.AttachmentView({
+      model: attachment,
+      timestamp: epoch
+    }).suggestedName();
+
+    var expected = '1970-01-01-000000';
+    assert(result === 'signal-' + expected + '.png');
+  });
+  it('should auto-generate a filename', function() {
     var epoch = new Date((new Date(0)).getTimezoneOffset() * 60 * 1000);
     var attachment = { contentType: 'image/png', data: 'grumpy cat' };
     var result = new Whisper.AttachmentView({