Minor refactors preparing to tackle Actor tests