Remove commented-out code
Added HDD data tests