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