This removes six from some of the tests code. The other test codes will be updated in per-driver changes. Change-Id: Ib168d5831ce30793b22a33aec85b81103a4150a7