Renames, common test code, etc

Change-Id: I9c275597b64931768c40b2b49e9340e3dcf4a0c3