new tests
merge
test shell and http get
Merge branch 'master' into develop