Removes magic numbers in CommandAdd
Minor changes in CommandAddTest