Added integration test and bootstrapping