Test cleanup as per review. Bug 1383070.