Fix last commit to ensure test cleans up properly.

Change-Id: I7a47ba8eec810e1b7c76bdecee39e3f9c3bba38f
1 file changed