Getting rid of some mistakes regarding the channel closing logic/test.