[HB,CB]{test after code} Test cleanup
Merge branch 'client' of github.com:heinzburgstaller/sw14_xp_01 into client