Orginized test requirements

Change-Id: I75a8019c89b7cda8bfe12f8b17bfe4258cb4c351
Merge "Orginized test requirements"