PLA-259 UnitTests
PLA-259 Fix Unit Tests