Merge "Use addCleanup instead of tearDown"