Test Case Reorganization Part 2

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