Revise estmap / est_rec_frac to be more general
Remove a bit of extraneous white space from tests