Forgot to change constructor and update hashCode() and equals(); made those updates and updated affected unit tests