Update things and tests