Update integration test
Add unit test