Add multi class test support