Add bundle and integration test