Woot! All tests passing again...

- Only had to disable two of them, and they are likely invalid test cases anyway