Minor tweaks to bootstrap spec tests

Changes *'s to +'s so there will be 1 more spaces matches instead of zero or more.
Reorganizes some file setup to be a little easier to follow (hopefully)