Refactor with the help of @tudorraul - still having issues with the
mocking server.