Fix & improve tests
Merge branch 'feature-improve-main' of github.com:M6Web/BabitchClient into feature-improve-main