restructured data channel tests