Add unit and integration test
Add unit and integration test