Minor bootstrap refactor; stubbing interactions