Better bootstrapping for tests