patch seems to apply. re running tests.