B test196

this is for the test #196. If possible, please consider only the following commits:
   3c9766d 
   c8321d0
   1833274 

The remaining commits are my private ones and the reverts. (So, taking them all cancel each other. Nonetheless, in order to avoid confusion, could you please take a look at only those three changes. In case that it is easy for the pull not to have irrelevant ones, please let me know.

Thanks for your time!
Yoshi