Develop cwatson ccda multi test

Changes per Dragon's UI feedback