Add full, refactored test suite, yay