Cleanup and refactor fixtures