try to fix time zone issues again
move timezone to decorator
fix spec
Merge pull request #799 from adrianob/fix_timezone_expires_at

Fix timezone expires at