Merge "JUnit for IdManager"