BVTCK-32 Incorporating review remarks
BVTCK-32 Aligning structure of test packages