Add some unit tests
Add some unit tests