changing default value instead of setting it via fields

fixed broken test

fixed quality violation

following another approach