Please, when you rebase and change your commits at the same time, do not force-push everything together. First do a force-push with the rebase, then another force-push for the genuine changes to the MR. It makes reviewing easier with the GitLab tools (and also with plain `git` commands).
Also, don't introduce the tests at the end of the MR. Rather, introduce tests at the beginning of the MR, mark them as `todo` and remove the `todo` marking when the tests start passing. This also makes the review easier. Please fix this second thing in this MR.