Fix test failures due to setting / clearing clock type in Streaming
Fix CheckpointSuite test failures