Unit test

merging unit tests