Add unit tests
Merge
Add more unit tests