Initial attempt to fence sat/sam test cases

Fixed four cli test modules in this round