Test Case Reorganization part 3

Change-Id: Icdc5b708f4be46b9a3a776679e9ea4da29046d3f
Signed-off-by: Luis Gomez <ecelgp@gmail.com>