Put in class test list and ability to add one