Cosmetic changes

trivial changes, but the test looks weird,it is not clear what the role of each class...

(btw can we use the sonar code formatting?)