Unit test

merging pull request