more perf tweaks; arbitrary moving of some of the test mocks :/