Refactor normal distribution and clean up occurences.
Temp fix to tests so they all run