DEVEN-175: fix tests - second attempt