Update unit tests
Refine the ordering of entropy sources
Update README