Fix non integration tests

With change #24, non integration can not run anymore.

(cherry picked from commit 76eecc8)
Update release tool

(cherry picked from commit 288755a)