Removed logging, reverted tests to "full" random.
Removed redundant calculations.