Minor test cleanup.
Avoid incorrect RSE behavior for self joins.

For now, disable RSE for self joins. This is probably not the right long-term
fix, but it at least avoids incorrect behavior.