looks like this is the change that really broke the tests. Not the above.