Fix integration test
Fix test bootstrap