NXDRIVE-46: Fix randomly failing test + make it more relevant (was testing the same thing several times)
NXDRIVE-46: Clean up unused variable
NXDRIVE-46: Improve comment about handling local changes with watchdog vs local scan