gabriel.russell can you take a look at this now, we need to clear up some of the test failures to keep patches from getting too hard to use. it should be a pretty trivial fix