Add Tests: Continue

Got rid of test set stuff (and changed the loading classes file stuff)