PLA-114: cleaning up the unit test