Fix test for inTimezone
Fix bug with r.literal + add tests for it