Some Test Modifications (for ADB)