clean up bootstrap generator tests a little