Merge Staging Fixes back through to dev

Includes Unit Tests for the Return URL change.