make NodeStore_remove private
more tests