Adding Id Generator, adjusting tests.