Update channel tests to reflect refactor updates to channel closing
Make sure the timeout deadline variable name is consistent addressing issue in change set 5df319eaf0b