Updated with latest libraries and test harness