Removed debugging/ updated test harness