Changed bootstrap to get tests working