refactor w/ fixtures. Fixes #14