refactor: isolate and check setup steps

Benoit Orihuelarequested to merge
refactor/isolate-and-check-setup-steps into develop

Merge request reports