2.20.2.150 command/test bugs fix