Add tests for r219479.