Update tests based on review feedback