Redo test structure, write some

TODO:
* Write shit loads more tests