Some work on bootstrapping for tests