Improve test structure

Change-Id: I165b94d3172e49f4cab7615192d05ba912e8aba4