The title "Cleanup" is a bit too generic imho. Better eould be something along the lines "Ceanup: Merge main() into unit test tsttestapp.cpp" along with a detailed description :) Maybe something for future commits? Good enough this time, but for commits in KDE Frameworks this would not be good enough, since "Cleanup" would then end up in David's changelog, which is too generic (cleanup of what?).

Please push.