I haven't fixed the test failures, I was just looking at your diff here on GitHub to understand the changes, which all make sense. If you get stumped on test failures, I can help.