No need for these test dependencies, lingering was causing it all.

Change-Id: Ic5421d1761fcf829ada35c69306f5f2ec28dc2a3