Reorganizing updates, some failing tests