Feature/testing bootstrap