S4-91 RemoteSenders to exclusive PEs, improve tests

Applied patch by Aimee Cheng
S4-91 Minor cleanups