[283] re-arranged test composition generation logic and added two relevant adl files

Revision: 283
Author: rong.chen

Log Message: