diff --git a/.gitignore b/.gitignore
index 4f1e63458e11d4ac46344fdb2b1e800c79a5c82c..75fce5654357e86b1752ff9999a8f8bfb062a076 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ bin/*.exe
 bin/*.txt
 bin/mac
 *pro.user*
+.qmake.stash
 qrc_*.cpp
 *.Debug
 *.Release
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 5fba6c98999e8f2e3f146a9b69d15a5dcc6889da..dbd246141aa3b6496f3da199e55270166cbc2bd9 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -767,7 +767,8 @@ HEADERS += \
 	src/qgcunittest/FlightModeConfigTest.h \
 	src/qgcunittest/FlightGearTest.h \
 	src/qgcunittest/TCPLinkTest.h \
-	src/qgcunittest/TCPLoopBackServer.h
+	src/qgcunittest/TCPLoopBackServer.h \
+	src/qgcunittest/QGCUASFileManagerTest.h
 
 SOURCES += \
 	src/qgcunittest/UASUnitTest.cc \
@@ -779,4 +780,5 @@ SOURCES += \
 	src/qgcunittest/FlightModeConfigTest.cc \
 	src/qgcunittest/FlightGearTest.cc \
 	src/qgcunittest/TCPLinkTest.cc \
-	src/qgcunittest/TCPLoopBackServer.cc
+	src/qgcunittest/TCPLoopBackServer.cc \
+	src/qgcunittest/QGCUASFileManagerTest.cc
diff --git a/src/qgcunittest/MockMavlinkFileServer.cc b/src/qgcunittest/MockMavlinkFileServer.cc
index 0a39c4885e2662a054e250106ce7cb6828f5305a..3457a895a69de89364fc997894a6f4a0686befd2 100644
--- a/src/qgcunittest/MockMavlinkFileServer.cc
+++ b/src/qgcunittest/MockMavlinkFileServer.cc
@@ -281,7 +281,7 @@ void MockMavlinkFileServer::_emitResponse(QGCUASFileManager::Request* request)
     
     request->hdr.crc32 = QGCUASFileManager::crc32(request);
     
-    mavlink_msg_encapsulated_data_pack(250, 0, &mavlinkMessage, 0 /*_encdata_seq*/, (uint8_t*)request);
+    mavlink_msg_encapsulated_data_pack(250, MAV_COMP_ID_IMU, &mavlinkMessage, 0 /*_encdata_seq*/, (uint8_t*)request);
     
     emit messageReceived(NULL, mavlinkMessage);
 }
diff --git a/src/qgcunittest/MultiSignalSpy.cc b/src/qgcunittest/MultiSignalSpy.cc
index 5d8d87c015c5c64eb9d1cab6deab2287b259eae7..d9f786f4f4641333ce49f831c26f4d24a7f2082b 100644
--- a/src/qgcunittest/MultiSignalSpy.cc
+++ b/src/qgcunittest/MultiSignalSpy.cc
@@ -96,6 +96,7 @@ bool MultiSignalSpy::checkSignalByMask(quint16 mask)
             Q_ASSERT(spy != NULL);
             
             if (spy->count() !=  1) {
+                _printSignalState();
                 return false;
             }
         }
@@ -114,10 +115,12 @@ bool MultiSignalSpy::checkOnlySignalByMask(quint16 mask)
 
         if ((1 << i) & mask) {
             if (spy->count() != 1) {
+                _printSignalState();
                 return false;
             }
         } else {
             if (spy->count() != 0) {
+                _printSignalState();
                 return false;
             }
         }
@@ -135,6 +138,7 @@ bool MultiSignalSpy::checkNoSignalByMask(quint16 mask)
             Q_ASSERT(spy != NULL);
 
             if (spy->count() != 0) {
+                _printSignalState();
                 return false;
             }
         }
@@ -232,3 +236,12 @@ bool MultiSignalSpy::waitForSignalByIndex(
 
     return spy->count() != 0;
 }
+
+void MultiSignalSpy::_printSignalState(void)
+{
+    for (size_t i=0; i<_cSignals; i++) {
+        QSignalSpy* spy = _rgSpys[i];
+        Q_ASSERT(spy != NULL);
+        qDebug() << "Signal index:" << i << "count:" << spy->count();
+    }
+}
diff --git a/src/qgcunittest/MultiSignalSpy.h b/src/qgcunittest/MultiSignalSpy.h
index 92fb905c16160f38bbb16a7a4541c92e6b1649ee..1ac5f4478de54c410493d0b9b9e0d5331a545722 100644
--- a/src/qgcunittest/MultiSignalSpy.h
+++ b/src/qgcunittest/MultiSignalSpy.h
@@ -59,6 +59,8 @@ public:
 private:
     // QObject overrides
     void timerEvent(QTimerEvent * event);
+    
+    void _printSignalState(void);
 
     QObject*        _signalEmitter;
     const char**    _rgSignals;
diff --git a/src/qgcunittest/QGCUASFileManagerTest.cc b/src/qgcunittest/QGCUASFileManagerTest.cc
index 79039953cee137da90c118166fe2e46a8ca823ff..78441d7b5834462587264ef9c5453c822dd75ea1 100644
--- a/src/qgcunittest/QGCUASFileManagerTest.cc
+++ b/src/qgcunittest/QGCUASFileManagerTest.cc
@@ -53,6 +53,7 @@ void QGCUASFileManagerUnitTest::init(void)
     
     bool connected = connect(&_mockFileServer, SIGNAL(messageReceived(LinkInterface*, mavlink_message_t)), _fileManager, SLOT(receiveMessage(LinkInterface*, mavlink_message_t)));
     Q_ASSERT(connected);
+    Q_UNUSED(connected);    // Silent release build compiler warning
 
     connected = connect(_fileManager, SIGNAL(statusMessage(const QString&)), this, SLOT(statusMessage(const QString&)));
     Q_ASSERT(connected);
diff --git a/src/qgcunittest/TCPLinkTest.cc b/src/qgcunittest/TCPLinkTest.cc
index 50471251e7f5f9b5128669109893e8bb52d90ece..b18a93e788d464b0bebaf58c1441736141c522cd 100644
--- a/src/qgcunittest/TCPLinkTest.cc
+++ b/src/qgcunittest/TCPLinkTest.cc
@@ -150,7 +150,7 @@ void TCPLinkUnitTest::_connectSucceed_test(void)
     QCOMPARE(_link->connect(), true);
     
     // Make sure we get the two different connected signals
-    QCOMPARE(_multiSpy->waitForSignalByIndex(connectedSignalIndex, 1000), true);
+    QCOMPARE(_multiSpy->waitForSignalByIndex(connectedSignalIndex, 10000), true);
     QCOMPARE(_multiSpy->checkOnlySignalByMask(connectedSignalMask | connected2SignalMask), true);
     QList<QVariant> arguments = _multiSpy->getSpyByIndex(connected2SignalIndex)->takeFirst();
     QCOMPARE(arguments.at(0).toBool(), true);