remove TestAPIM reliance on order of execution