Channel ID added and test finish