Added more tests and class stuff
Attempt at fixing shit