the tests seem to pass without these changes.