Testing Branch for SMSmart