Minor bits of stubbage
Merge branch 'refactor/test-stubs'