Updating tests for mocking of repository/services still wip...