Merge "Remove tests of dead code."