mod - 1. remove obsolete tests. \n2. Add some setup to existing tests.

Change-Id: I5ceee8da7e106b2b70e404ec10b4ef7eef97b4ec