[Olena-patches] milena r1622: Some fixes for unit/sanity tests