Merge "Add test for changing annotations."