Adding the enum id test
Removing unnecessary IdFactory templating
Breaking up a line