Updated test script to test latest additions to Users Channels Matrix
Code cleanup