Changes to update tests