Made requested changes in adb tests