Clean-up test docs+

Change-Id: I707d1d46536f3bdce397d180ae9b8e3ed59935cc
Merge "Clean-up test docs+"