Removed extra functions, fixed formatting of output of telescoping-trends
Tweaked calculate-trends test to reflect optimized short trend calcs; fixed formatting