Some test readme changes and cleanup dup tests

Change-Id: Icd314a89401fea86d254bf86fe8a84f62c981546
Merge "Some test readme changes and cleanup dup tests"