Added Tests for the Estimate friends. I'm starting to wonder about test design: a conflict between DRY and running every test even when one fails has cropped up. Investigating that now.