1a382cd61c
- Fix type issue with unittest.SkipTest - Fix query timestamp preservation
- Fix type issue with unittest.SkipTest - Fix query timestamp preservation