diff --git a/qgcunittest/UASUnitTest.cc b/qgcunittest/UASUnitTest.cc
index 117aed1fbc6d33ec92b132da309c10851eb690d9..c74539f43a75961c79aa786caad20e24343fc673 100644
--- a/qgcunittest/UASUnitTest.cc
+++ b/qgcunittest/UASUnitTest.cc
@@ -163,10 +163,7 @@ void UASUnitTest::getYaw_test()
 
 void UASUnitTest::getSelected_test()
 {
-    bool test = uas->getSelected();
-   if(test != NULL){
-    QCOMPARE(test, false);
-    }
+    QCOMPARE(uas->getSelected(), false);
 }
 
 void UASUnitTest::getSystemType_test()
@@ -176,6 +173,7 @@ void UASUnitTest::getSystemType_test()
 
 void UASUnitTest::getAirframe_test()
 {
+    //when uas is constructed, airframe is set to QGC_AIRFRAME_GENERIC which is 0
     QCOMPARE(uas->getAirframe(), 0);
 
     uas->setAirframe(25);
diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index e9188bc29d13cdae22ad9cfcf472b6fc19e41e02..f555ef806fde01fb08bd5da7fa7ef53d1946341e 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -86,7 +86,7 @@ UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(),
     receivedRGBDImageTimestamp(0.0),
     #endif
     paramsOnceRequested(false),
-    airframe(QGC_AIRFRAME_EASYSTAR),
+    airframe(QGC_AIRFRAME_GENERIC),
     attitudeKnown(false),
     paramManager(NULL),
     attitudeStamped(false),
@@ -104,7 +104,7 @@ UAS::UAS(MAVLinkProtocol* protocol, int id) : UASInterface(),
         componentID[i] = -1;
         componentMulti[i] = false;
     }
-
+    
     color = UASInterface::getNextColor();
     
     setBatterySpecs(QString("9V,9.5V,12.6V"));
@@ -152,9 +152,9 @@ void UAS::readSettings()
 void UAS::deleteSettings()
 {
     this->name = "";
-    this->airframe = QGC_AIRFRAME_EASYSTAR;
+    this->airframe = QGC_AIRFRAME_GENERIC;
     this->autopilot = -1;
-   setBatterySpecs(QString("9V,9.5V,12.6V"));
+    setBatterySpecs(QString("9V,9.5V,12.6V"));
 }
 
 int UAS::getUASID() const