Haha... Lots of mocks!
Refactored mock a bit.
More changes... Mainly around configs?