Merge "Cactus: refactor of cactus_test_cmds.h"