Add bootstrap file
Enhance tests