Fixed tests. Added validation to verify cmd.