I have not yet gotten all tests to pass on these changes, which also means I do not have coverage comparison.