DC21-514: fix accordingly to cucumber tests