Merge "Add tests for invalidating archives on change."