Fix Time Zone tests
Merge branch 'master' of github.com:CruGlobal/mpdx