Refactored adb-pure test s.t. tests pass w/o dev