Fixed #2 by making indexing of ID distinct from others.
Improved further the test for issue #2.