Modify tests to support new location of screen relationship setting.