FIX: Remove the attribute count matcher as it is no longer part of the contract
TEMP: all test pass
NEW: Change to use native Hamcrest AllOf instead of custom matcher collection
Remove Attribute class and use separated name value instead