Merge "Remove a test for dead code."