Merge "Revert "Add test for changing annotations.""