Fix logic error and update tests to accomodate new fill behavior.