Various accreted testing changes