Revert "Some Test Modifications (for ADB)"

This reverts commit 3990aa2527c5f4f962265a929d7737f674bba54b.