Fixed Fill and added a fill test