Add sorting / randomizing of Testclasses