Fixed failing tests triggered from commit cc4fbcdd998aba71da431740943f84c61e37c7b6