Add test
Complete test
Add integration test