B test196

I thank Bebe, Alin and Andrei for your reviews. I modified according to them, and here is an updated pull request.

Thank you in advance:)