Added FillOption to Fill operation.

Also formatted some code, added another unit test.