Update tests added after bootstrap refactor in aac98