Make all fill_* use formatted numbers since they're calculated.  Update tests to reflect the formatted layer fill numbers.