Cosmetic
Adding tests while understanding #2919
Removing useless data debug output