[utils,test] adapt to norm/inner changes