Better tests.
Fix scaling/fill value conflict.