@ashfurrow => test fixings

Looks like my changes broke snapshots. And I wasn't sending a RAC signal when expected. Thus a test cleanup PR.

:green_apple: