Fixing RetentionTests