Implement proper fixture scoping and cleanups