Improving tests with mocking and test/resources folder, more to come.