Better test and mocking structure introduced.