discussed with @JohanLorenzo and we'll experiment with this in a different pull.
we'll keep this one to refactor but wiht the same test logic.