updated bootstrap data and fixed some tests