Unit test for 191
Merge branch 'release/3'