PLA-1468 Added missing fields - unit tests