DEVEN-210 fixed failing tests