PLA-1641b unit tests cleanup