Refactor how the execution of methods are handled. 2 Tests are broken but the code works as intended, gonna check later what happened.