make e2e tests passed
Merge pull request #234 from just-boris/master

make e2e tests passed