Feathre/iteration 3 dev fix tests

Fixed tests and add deck parameters to equals and hashCode.