Update project and add integration test