Moving specific methods from Util.java to RetentionTest.java.
Moving more methods form Util to RetentionTest.
Cleaning up RetentionTest.
More cleanup of RetentionTests.
Removing unused code from Util.java.
Minor cleanup of RetentionTest.
Use base test directory for running tests.