Fix incorrect use of VarSet; Clean up print format;
Added test and diff command