Add unit test
Update unit tests