improving unit/functional tests