minor: removing duplicated code
workaround for #KT-4633
tests for fields