In the process I had to refactor some methods which required the mock
connection of tests to be changed as well.