Fixing unit/functional test expectations