Fixing AFFL bulk tests.