fix tests
fix timezone, resque come back