Improved AttributesMap - include duplicate attributes when declared in multiple interfaces
Improved unit test suite
Refactored unit tests