Refactoring to improve performance of spec suite

Only runs rjr initialization setup for the specs
that need it / test it.

Now runs faster, though there is more that can be
done to speed it up. See comments for some suggestions

No functional changes beyond performance refactoring.
Fix a few broken ui tests