Add commandos, split to helper and message types
modified test agent