fixed another timezone issue and completed tests