Holy hell that was a long and tedious process. It's nice to finally have everything in the new test suite. Still plenty of work to be done with refactoring (both the library and test cases), though.