Changes done and the tests pass again, it seems I have a more elegant solution.