Fixing both Cardinality , Relation issue
Adding some unit-test