Refine fixture structure. Make it easier to set up and require other fixtures as dependencies.