Fixing up tests a little bit
Smoothing out some calculations
Smoothing out some calculations
Adding goldenrod test