Added test cases. Also make expireRewatch don't need a RetryStrategy.