Fixing conflicts and updated plottest to be only CGM and skintemp