Fixed test issue apparently caused by three levels of classes

Change-Id: I4985e39257d55eada134f340fb9981285c9bb26f