added AMAF vs RAVE test mode