Tests refactoring

Tests have the same results before and after refactoring
RetentionTest still has hardcoded hdfs path because it is hardcoded in Util and other classes