Pr/1

Fixed unit tests