Simplify some code, use less confusing crypto nonsense

All we wanted were 4 random bytes in hex!
I dont' even know
Fixed tests.
Fixed more tests.
Merge pull request #215 from alex/patch-2

Simplify some code, use less confusing crypto nonsense