ADD TEST + CLASSLISTS