Include claims integration test and fix it