add make test cmd
Merge branch 'master' into canary