Unified discrim gen

Improves current discrim generation so its all on a single function and not spread out as it was before.

Also adds a test that creates a single user to make sure discriminator generation works as expected.