Even more tests
Needs tests, but it's sorta working