[RFC] fix unit tests

Fixed unit tests