Merge pull request #180 from gabrielweyer/develop

Fixed timezone issue in unit test