More bootstrap + tests