Refactor addon fixtures.

Migrate to currently suggested exporting of an object.

Closes: #1842.