Updated DataAccessTest.
Remove unused imports.
Updated TestUtil.