BS-11040 Test DefaultvalueContribution and clean code