Fixed failing tests due to merge with 'Evgeny'