Refactoring tests Bootstrap