Consolidating AP tests....or not?