diff --git a/server/server.go b/server/server.go
index 0bd1a0b..a2310c8 100644
--- a/server/server.go
+++ b/server/server.go
@@ -153,6 +153,7 @@ func (s *Server) PopulateWithTestData() {
 		log.Fatal().Msgf("Error storing test attachment: %s", err)
 	} else {
 		attachmentMessage := data.GenerateAttachmentMessage(attachmentConversation.Participants, *attachmentGUID)
+		attachmentMessage.Date = model.Date(time.Now())
 		s.AppendMessageToConversation(&attachmentConversation, attachmentMessage)
 	}
 
diff --git a/web/server.go b/web/server.go
index da15336..b6b4e7e 100644
--- a/web/server.go
+++ b/web/server.go
@@ -442,7 +442,7 @@ func NewMockHTTPServer(config MockHTTPServerConfiguration) *MockHTTPServer {
 	this.mux.Handle("/pollUpdates", http.HandlerFunc(this.handlePollUpdates))
 	this.mux.Handle("/sendMessage", http.HandlerFunc(this.handleSendMessage))
 	this.mux.Handle("/markConversation", http.HandlerFunc(this.handleMarkConversation))
-	this.mux.Handle("/fetchAttachment", http.HandlerFunc(this.handleFetchAttachment))
+	this.mux.Handle("/attachment", http.HandlerFunc(this.handleFetchAttachment))
 	this.mux.Handle("/uploadAttachment", http.HandlerFunc(this.handleUploadAttachment))
 	this.mux.Handle("/updates", http.HandlerFunc(this.handleUpdates))
 
diff --git a/web/server_test.go b/web/server_test.go
index 70c368b..2e54786 100644
--- a/web/server_test.go
+++ b/web/server_test.go
@@ -632,7 +632,7 @@ func TestAttachments(t *testing.T) {
 	defer s.Server.DeleteAttachment(guid)
 
 	// Fetch it back
-	resp, err = http.Get(httpServer.URL + fmt.Sprintf("/fetchAttachment?guid=%s", guid))
+	resp, err = http.Get(httpServer.URL + fmt.Sprintf("/attachment?guid=%s", guid))
 	if err != nil {
 		t.Fatalf("Error fetching attachment: %s", err)
 	}