Fix unit tests after fields removal