Merge "Remove some obviously useless tests (and fix the others so they build)."