Clean up test files

General cleanup using helpers for fixtures, sorting/removing module dependencies, etc.