TOOLS-496: prevent nil on arrivals
TOOLS-512: fix tool unit tests