Add null checking for longs in DeviceData
Finalize ImageDataCollectorTest