unit test changes
Merge branch 'Logic'