Clean up after testing

Change-Id: I62ebcc660d4e93eb88d9cd1a62859c993dfbbb79
Merge "Clean up after testing"