Prepare for testing on AVD