The tests are broken now, I should really fix those. Perhaps also add a few new tests for the changes I made.