Strategy api v2

I really feel these mocks are a burden as they mock away important implementation details we now have untested. We should look into how to get a fully functioning test-db working instead.