[Reviewer: Andy] UT speedup part 1

Hi Andy - as discussed, and as described in commit log: this gets us a significant speedup of real time in the UTs. I have a separate fix in progress which saves a huge amount of user time, but that's not included here yet. Please can you review?