PLA-1584

Fixed unit tests and fast unit tests
As above