Unit test
Merging with latest changes