[TM-37] - fix test errors