Update for sandbox reorganization
Rebuild fixtures