Updates from tests