Move knot-tying back into the test suite, and renamed some stuff