Merge "Remove a test for backwards compatibility we no longer support."