Agreed. I'll take @nasthagiri's file and rework the tests to accommodate it.