SI-6615 junit test
Merge pull request #3361 from adriaanm/pr3303-test

 junit test