Fixes some issue after testing the code.

Signed-off-by: crynobone <crynobone@gmail.com>
Port over command to 2.1

Signed-off-by: crynobone <crynobone@gmail.com>
Change testcase namespace.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2