ATMO-9108: code comments, test