Renamed exception
Timezone is now taken into account
More tests