Added Timezone

- Updated test case
- Fix env string have white space