move test to update
fix json calc add command
Merge pull request #376 from modilabs/misc-fixs

Misc fixs