Add more unit tests
Improving unit tests