PLA-1584

Fixed unit tests and fast unit tests
:+1: Nice catch!