Fix zero values messing up baseline.
Fix and extend test suit and reset baseline for all elements.
Fix baseline values being applied more than once.