DEVEN-210: fixed tests