Reviewer Rob - Rf integration testing fixes

Rob, this is the branch I was using when testing Ralf last sprint which contains multiple fixes for issues I ran into.

Mike's already reviewed the biggest change in here so I've marked the to-be-reviewed files as comments in the review job.

Tested live and in UT.