I think that we could reorganize the unit tests and remove a lot of duplicated code. That could be a nice opportunity to move on to pytest.