hotfix: refactor to accommodate latest pytest

xFill_bldr fixture relied upon behavior that was removed in pytest
2.5.0. New structure is probably better anyway. Made xFill_bldr into an
plain-old instance method.