ISPN-2281 Update configuration XSD and remove commented code
ISPN-2281 Make Equivalence extend Serializable and fix tests