Fix line commenting.
Fix edge case in Filler.

Also improved test infrastructure.