Updating based on rebase to fix tests