BAS composer controls bug fixed, testcases updated for new naming style.