Bootstrap test

Merging bootstrap test with master