Refactor addon fixtures.

Migrate to currently suggested exporting of an object.
Merge pull request #1995 from rwjblue/refactor-addon-tests

Refactor addon fixtures.