- Sorted fields before iterating through them for annotations in TestClass
- Removed redundant wrapping of unmodifiableMap in getters of annotationToFields/Methods