Fixes so that the timezone gets written when it explicit is specificied in a test