Remaining test changes for ref id to ref name.

Tests still aren't passing yet.