PLA-399 fixing unit tests