Update tests added after bootstrap refactor in aac98
Merge pull request #283 from dstockwell/fix-tests

Update tests added after bootstrap refactor in aac98